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>
Carlos Martín Nieto committed
Oct 29, 2017 at 16:12 UTC
bab76141da04ab094ece449e2127ef43a8fa60c8
4 files changed
+6
-9
Documentation/diff-heuristic-options.txt
deleted
-5
@@ -1,5 +0,0 @@
1
---indent-heuristic::
2
---no-indent-heuristic::
3
- These are to help debugging and tuning experimental heuristics
4
- (which are off by default) that shift diff hunk boundaries to
5
- make patches easier to read.
Documentation/diff-options.txt
+6
-1
@@ -63,7 +63,12 @@ ifndef::git-format-patch[]
63
Synonym for `-p --raw`.
64
endif::git-format-patch[]
65
66
-include::diff-heuristic-options.txt[]
66
+--indent-heuristic::
67
+ Enable the heuristic that shift diff hunk boundaries to make patches
68
+ easier to read. This is the default.
69
+
70
+--no-indent-heuristic::
71
+ Disable the indent heuristic.
72
73
--minimal::
74
Spend extra time to make sure the smallest possible
Documentation/git-annotate.txt
-1
@@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems.
23
OPTIONS
24
-------
25
include::blame-options.txt[]
26
-include::diff-heuristic-options.txt[]
26
27
SEE ALSO
28
--------
Documentation/git-blame.txt
-2
@@ -89,8 +89,6 @@ include::blame-options.txt[]
89
abbreviated object name, use <n>+1 digits. Note that 1 column
90
is used for a caret to mark the boundary commit.
91
92
-include::diff-heuristic-options.txt[]
93
-
92
93
THE PORCELAIN FORMAT
94
--------------------