mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
fc849d8d6b
commit
bab76141da
|
@ -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.
|
|
|
@ -63,7 +63,12 @@ ifndef::git-format-patch[]
|
||||||
Synonym for `-p --raw`.
|
Synonym for `-p --raw`.
|
||||||
endif::git-format-patch[]
|
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::
|
--minimal::
|
||||||
Spend extra time to make sure the smallest possible
|
Spend extra time to make sure the smallest possible
|
||||||
|
|
|
@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems.
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
include::blame-options.txt[]
|
include::blame-options.txt[]
|
||||||
include::diff-heuristic-options.txt[]
|
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -89,8 +89,6 @@ include::blame-options.txt[]
|
||||||
abbreviated object name, use <n>+1 digits. Note that 1 column
|
abbreviated object name, use <n>+1 digits. Note that 1 column
|
||||||
is used for a caret to mark the boundary commit.
|
is used for a caret to mark the boundary commit.
|
||||||
|
|
||||||
include::diff-heuristic-options.txt[]
|
|
||||||
|
|
||||||
|
|
||||||
THE PORCELAIN FORMAT
|
THE PORCELAIN FORMAT
|
||||||
--------------------
|
--------------------
|
||||||
|
|
Loading…
Reference in a new issue