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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
hashpling · Nov 2, 2017 · bab7614 · bab7614
1 parent fc849d8
commit bab7614
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt
diff --git 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

diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
@@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems.
 OPTIONS
 -------
 include::blame-options.txt[]
-include::diff-heuristic-options.txt[]
 
 SEE ALSO
 --------

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
@@ -89,8 +89,6 @@ include::blame-options.txt[]
 	abbreviated object name, use <n>+1 digits. Note that 1 column
 	is used for a caret to mark the boundary commit.
 
-include::diff-heuristic-options.txt[]
-
 
 THE PORCELAIN FORMAT
 --------------------
-Original file line number
+Diff line change
@@ Expand Up @@
     OPTIONS
     -------
     include::blame-options.txt[]
-    include::diff-heuristic-options.txt[]
     SEE ALSO
     --------
@@ Expand Down @@