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>

diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt
deleted file mode 100644 (file)
index d4f3d95..0000000
--- a/Documentation/diff-heuristic-options.txt
+++ /dev/null
@@ -1,5 +0,0 @@
---indent-heuristic::
---no-indent-heuristic::
-       These are to help debugging and tuning experimental heuristics
-       (which are off by default) that shift diff hunk boundaries to
-       make patches easier to read.

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 56dedafcd4bd68c4192fbe22469428ed274a46a0..f028689f7c17d4278df19701f7113e18b154e025 100644 (file)
--- 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[]
 
        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
 
 --minimal::
        Spend extra time to make sure the smallest possible

diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 94be4b85e099f8b67901a737b8347ee02e6c6a6c..05fd482b74ed00445613c7cc9b8a0b019ae31550 100644 (file)
--- 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[]
 OPTIONS
 -------
 include::blame-options.txt[]

-include::diff-heuristic-options.txt[]

 
 SEE ALSO
 --------
 
 SEE ALSO
 --------

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index fdc3aea30a4cdb480d469455a66e51a76366be93..16323eb80e3108794067c4dbfcbfe25e46938498 100644 (file)
--- 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.
 
        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
 --------------------
 
 THE PORCELAIN FORMAT
 --------------------