diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:22 -0700 |
| commit | 7a63a920fd9842f0ccb7a88c8df7652d905fc1ec (patch) | |
| tree | 9939c7ff07902ea3e3446d1f1388d32ec99e1721 /Documentation | |
| parent | 0941d6054524bc91f45bf3cbb1c641712b0e0e6d (diff) | |
| parent | 81b568c839376a10cd5fe29db0b8a72f537fa36a (diff) | |
| download | git-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 '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. |