summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2017-10-29 15:12:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-02 05:51:24 (GMT)
commitbab76141da04ab094ece449e2127ef43a8fa60c8 (patch)
tree8da041a25b704b420b2cc3412195f0997170c941 /Documentation/diff-options.txt
parentfc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f (diff)
downloadgit-bab76141da04ab094ece449e2127ef43a8fa60c8.zip
git-bab76141da04ab094ece449e2127ef43a8fa60c8.tar.gz
git-bab76141da04ab094ece449e2127ef43a8fa60c8.tar.bz2
diff: --indent-heuristic is no longer experimental
This heuristic has been the default since 2.14 so we should not confuse our users by saying that it's experimental and off by default. Signed-off-by: Carlos Martín Nieto <cmn@dwim.me> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 56dedaf..f028689 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/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