diff options
| author | Michal Privoznik <mprivozn@redhat.com> | 2013-01-16 08:51:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-16 09:37:45 -0800 |
| commit | 07ab4dec80f1c24660ed4bc371849fb4f11a4ee3 (patch) | |
| tree | 3f9fc184e856b805b2d7a52873fd7f6ea6aee313 /contrib | |
| parent | 216120ab8387c5c9c13b673eab2ff5e1d2d9cbb7 (diff) | |
| download | git-07ab4dec80f1c24660ed4bc371849fb4f11a4ee3.tar.gz git-07ab4dec80f1c24660ed4bc371849fb4f11a4ee3.tar.xz | |
config: Introduce diff.algorithm variable
Some users or projects prefer different algorithms over others, e.g.
patience over myers or similar. However, specifying appropriate
argument every time diff is to be used is impractical. Moreover,
creating an alias doesn't play nicely with other tools based on diff
(git-show for instance). Hence, a configuration variable which is able
to set specific algorithm is needed. For now, these four values are
accepted: 'myers' (which has the same effect as not setting the config
variable at all), 'minimal', 'patience' and 'histogram'.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 383518ca6..33e25dc08 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1839,6 +1839,7 @@ _git_config () diff.suppressBlankEmpty diff.tool diff.wordRegex + diff.algorithm difftool. difftool.prompt fetch.recurseSubmodules |