diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-18 02:36:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 02:36:06 +0200 |
| commit | ca01600306863ecfa8bbef769b8e1386cb149785 (patch) | |
| tree | 30507da396d4a19240aed15c47a2f4356dd3987d /diff.c | |
| parent | Merge branch 'jc/maint-smart-http-race-upload-pack' (diff) | |
| parent | xdiff/xhistogram: drop need for additional variable (diff) | |
| download | git-ca01600306863ecfa8bbef769b8e1386cb149785.tar.xz git-ca01600306863ecfa8bbef769b8e1386cb149785.zip | |
Merge branch 'rc/histogram-diff'
* rc/histogram-diff:
xdiff/xhistogram: drop need for additional variable
xdiff/xhistogram: rely on xdl_trim_ends()
xdiff/xhistogram: rework handling of recursed results
xdiff: do away with xdl_mmfile_next()
Make test number unique
xdiff/xprepare: use a smaller sample size for histogram diff
xdiff/xprepare: skip classification
teach --histogram to diff
t4033-diff-patience: factor out tests
xdiff/xpatience: factor out fall-back-diff function
xdiff/xprepare: refactor abort cleanups
xdiff/xprepare: use memset()
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3393,6 +3393,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL); else if (!strcmp(arg, "--patience")) DIFF_XDL_SET(options, PATIENCE_DIFF); + else if (!strcmp(arg, "--histogram")) + DIFF_XDL_SET(options, HISTOGRAM_DIFF); /* flags options */ else if (!strcmp(arg, "--binary")) { |