Re: [PATCH] diff: --indent-heuristic is no longer experimental

Junio C Hamano [off-list ref] writes:

Carlos Martín Nieto [off-list ref] writes:

quoted

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 <redacted>
---
 Documentation/diff-heuristic-options.txt | 5 -----
 Documentation/diff-options.txt           | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 Documentation/diff-heuristic-options.txt

I suspect that this patch is incomplete.  The build procedure barfs
and dies while making git-annotate.html, claiming that it wants to
find diff-heuristic-options.txt that no longer exists.

The fix is obvious once you have time to sip your tea and look at
the output from "git grep" ;-)

Subject: [PATCH] SQUASH???

---
 Documentation/git-annotate.txt | 1 -
 Documentation/git-blame.txt    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 94be4b85e0..05fd482b74 100644
--- 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
index fdc3aea30a..16323eb80e 100644
--- 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
 --------------------

-- 
2.15.0-206-g5fb43f7f39