diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-04-05 13:19:14 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-05 11:01:08 -0700 |
| commit | 0895c6d4c09045a3faeb7b652a844fc81c774631 (patch) | |
| tree | eae4bd0294d46dee247c129c72b7f4cbae3c3aaf /xdiff/xdiffi.h | |
| parent | git-merge(1): document diff-algorithm option to merge-recursive (diff) | |
| download | tgif-0895c6d4c09045a3faeb7b652a844fc81c774631.tar.xz | |
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>
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions