| commit | 0895c6d4c09045a3faeb7b652a844fc81c774631 | |
| author | John Keeping <john@keeping.me.uk> | |
| Fri, 5 Apr 2013 12:19:14 +0000 (5 13:19 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Apr 2013 18:01:08 +0000 (5 11:01 -0700) | ||
| tree | eae4bd0294d46dee247c129c72b7f4cbae3c3aaf | treesnapshot (tar.gz zip) |
| parent | 4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884 | commitdiff |
diff: allow unstuck arguments with --diff-algorithm
The argument to --diff-algorithm is mandatory, so there is no reason to
require the argument to be stuck to the option with '='. Change this
for consistency with other Git commands.
Note that this does not change the handling of diff-algorithm in
merge-recursive.c since the primary interface to that is via the -X
option to 'git merge' where the unstuck form does not make sense.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The argument to --diff-algorithm is mandatory, so there is no reason to
require the argument to be stuck to the option with '='. Change this
for consistency with other Git commands.
Note that this does not change the handling of diff-algorithm in
merge-recursive.c since the primary interface to that is via the -X
option to 'git merge' where the unstuck form does not make sense.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff.c | diffblobblamehistory |