summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-06 13:45:42 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-06 13:45:42 +0900
commita65b67605da51cd9b94659acdac8984dd205dcc7 (patch)
tree8ceb51ee29428c272dec1ba45a42c7db737ecbef /diff-options.txt
parentce019c05e3dd0419834876477675e32340b17936 (diff)
downloadgit-htmldocs-a65b67605da51cd9b94659acdac8984dd205dcc7.tar.gz
Autogenerated HTML docs for v2.15.0-55-gc2ece
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/diff-options.txt b/diff-options.txt
index a88c76741..dd0dba5b1 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -63,7 +63,12 @@ ifndef::git-format-patch[]
Synonym for `-p --raw`.
endif::git-format-patch[]
-include::diff-heuristic-options.txt[]
+--indent-heuristic::
+ Enable the heuristic that shift diff hunk boundaries to make patches
+ easier to read. This is the default.
+
+--no-indent-heuristic::
+ Disable the indent heuristic.
--minimal::
Spend extra time to make sure the smallest possible