diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 17:49:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 17:49:25 (GMT) |
| commit | 713b85c758926876af93fcabf4aae83391778195 (patch) | |
| tree | bab82ae02e533f5d6abc201a447d8a5908c3e851 /diff.c | |
| parent | 689b047072030db30d101d43dbef6afd3b703c09 (diff) | |
| parent | 81b568c839376a10cd5fe29db0b8a72f537fa36a (diff) | |
| download | git-713b85c758926876af93fcabf4aae83391778195.zip git-713b85c758926876af93fcabf4aae83391778195.tar.gz git-713b85c758926876af93fcabf4aae83391778195.tar.bz2 | |
Merge branch 'rs/diff-cleanup-records-fix' into maint
* 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.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -3385,6 +3385,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")) |