Skip to content

Commit bab7614

Browse files
carlosmngitster
authored andcommitted
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]>
1 parent fc849d8 commit bab7614

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Documentation/diff-heuristic-options.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

Documentation/diff-options.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,12 @@ ifndef::git-format-patch[]
6363
Synonym for `-p --raw`.
6464
endif::git-format-patch[]
6565

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.
6772

6873
--minimal::
6974
Spend extra time to make sure the smallest possible

Documentation/git-annotate.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems.
2323
OPTIONS
2424
-------
2525
include::blame-options.txt[]
26-
include::diff-heuristic-options.txt[]
2726

2827
SEE ALSO
2928
--------

Documentation/git-blame.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ include::blame-options.txt[]
8989
abbreviated object name, use <n>+1 digits. Note that 1 column
9090
is used for a caret to mark the boundary commit.
9191

92-
include::diff-heuristic-options.txt[]
93-
9492

9593
THE PORCELAIN FORMAT
9694
--------------------

0 commit comments

Comments
 (0)