]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
diff: Introduce --diff-algorithm command line option
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 16 Jan 2013 07:51:58 +0000 (08:51 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jan 2013 17:41:18 +0000 (09:41 -0800)
commit07924d4d50e5304fb53eb60aaba8aef31d4c4e5e
tree10760d4a006cead5202c480677f94ffac652f667
parent07ab4dec80f1c24660ed4bc371849fb4f11a4ee3
diff: Introduce --diff-algorithm command line option

Since command line options have higher priority than config file
variables and taking previous commit into account, we need a way
how to specify myers algorithm on command line. However,
inventing `--myers` is not the right answer. We need far more
general option, and that is `--diff-algorithm`.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-options.txt
contrib/completion/git-completion.bash
diff.c
diff.h
merge-recursive.c