summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-21 17:49:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-21 17:49:25 (GMT)
commit713b85c758926876af93fcabf4aae83391778195 (patch)
treebab82ae02e533f5d6abc201a447d8a5908c3e851 /Documentation
parent689b047072030db30d101d43dbef6afd3b703c09 (diff)
parent81b568c839376a10cd5fe29db0b8a72f537fa36a (diff)
downloadgit-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 'Documentation')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b620b3a..5c53bdb 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.