summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 16:44:27 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-26 16:44:27 -0700
commitad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb (patch)
tree95495194621897b14bcc1d50852cc2fa8bbbf2f6 /diff-options.txt
parent5380048278a5f5aa14549fffee029a8273a8bd0d (diff)
downloadgit-htmldocs-ad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb.tar.gz
Autogenerated HTML docs for v2.10.0-440-g21f86
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt7
1 files changed, 1 insertions, 6 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 7805a0cca..2d77a1962 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -63,12 +63,7 @@ ifndef::git-format-patch[]
Synonym for `-p --raw`.
endif::git-format-patch[]
---compaction-heuristic::
---no-compaction-heuristic::
- These are to help debugging and tuning an experimental
- heuristic (which is off by default) that shifts the hunk
- boundary in an attempt to make the resulting patch easier
- to read.
+include::diff-heuristic-options.txt[]
--minimal::
Spend extra time to make sure the smallest possible