1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 06:17:56 +01:00

Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint

Doc update.

* cn/diff-indent-no-longer-is-experimental:
  diff: --indent-heuristic is no longer experimental
This commit is contained in:
Junio C Hamano 2017-11-15 12:05:04 +09:00
commit da2b4ee388
4 changed files with 6 additions and 9 deletions

View file

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

View file

@ -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

View file

@ -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
--------

View file

@ -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
--------------------