summaryrefslogtreecommitdiff
path: root/t/t3031-merge-criscross.sh
diff options
context:
space:
mode:
authorLibravatar Michal Privoznik <mprivozn@redhat.com>2013-01-16 08:51:57 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-16 09:37:45 -0800
commit07ab4dec80f1c24660ed4bc371849fb4f11a4ee3 (patch)
tree3f9fc184e856b805b2d7a52873fd7f6ea6aee313 /t/t3031-merge-criscross.sh
parentgit-completion.bash: Autocomplete --minimal and --histogram for git-diff (diff)
downloadtgif-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 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions