summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-13 19:03:22 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-13 19:03:22 -0700
commit7a63a920fd9842f0ccb7a88c8df7652d905fc1ec (patch)
tree9939c7ff07902ea3e3446d1f1388d32ec99e1721 /diff.c
parent0941d6054524bc91f45bf3cbb1c641712b0e0e6d (diff)
parent81b568c839376a10cd5fe29db0b8a72f537fa36a (diff)
downloadgit-7a63a920fd9842f0ccb7a88c8df7652d905fc1ec.tar.gz
Merge branch 'rs/diff-cleanup-records-fix'
* rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index eed227a6ac..d922b77aef 100644
--- a/diff.c
+++ b/diff.c
@@ -3387,6 +3387,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
}
/* xdiff options */
+ else if (!strcmp(arg, "--minimal"))
+ DIFF_XDL_SET(options, NEED_MINIMAL);
+ else if (!strcmp(arg, "--no-minimal"))
+ DIFF_XDL_CLR(options, NEED_MINIMAL);
else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
DIFF_XDL_SET(options, IGNORE_WHITESPACE);
else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))