diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:25 -0700 |
| commit | 713b85c758926876af93fcabf4aae83391778195 (patch) | |
| tree | bab82ae02e533f5d6abc201a447d8a5908c3e851 /Documentation | |
| parent | 689b047072030db30d101d43dbef6afd3b703c09 (diff) | |
| parent | 81b568c839376a10cd5fe29db0b8a72f537fa36a (diff) | |
| download | git-713b85c758926876af93fcabf4aae83391778195.tar.gz git-713b85c758926876af93fcabf4aae83391778195.tar.xz | |
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 '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 b620b3afe..5c53bdba9 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. |