diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-01 21:56:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-03 11:58:18 -0700 |
| commit | 81b568c839376a10cd5fe29db0b8a72f537fa36a (patch) | |
| tree | 375e90f7c9c7f0087562e3cccbb20f82a764e27d /Documentation | |
| parent | Revert removal of multi-match discard heuristic in 27af01 (diff) | |
| download | tgif-81b568c839376a10cd5fe29db0b8a72f537fa36a.tar.xz | |
diff: resurrect XDF_NEED_MINIMAL with --minimal
Earlier, 582aa00 (git diff too slow for a file, 2010-05-02)
unconditionally dropped XDF_NEED_MINIMAL option from the internal xdiff
invocation to help performance on pathological cases, while hinting that a
follow-up patch could reintroduce it with "--minimal" option from the
command line.
Make it so.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index b620b3afec..5c53bdba94 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -45,6 +45,10 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] +--minimal:: + Spend extra time to make sure the smallest possible + diff is produced. + --patience:: Generate a diff using the "patience diff" algorithm. |