summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-06 04:11:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-06 04:11:27 (GMT)
commit662ac3b3a8a16fd749b598c85c4d8bfea5bb208e (patch)
treedf06d7c450c987d4f94c8e5b9ae1ccf109ef077d /Documentation/diff-options.txt
parent2502f018f4cc514b75bdd50c20695d8a35e1d0b5 (diff)
parentbab76141da04ab094ece449e2127ef43a8fa60c8 (diff)
downloadgit-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.zip
git-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.tar.gz
git-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.tar.bz2
Merge branch 'cn/diff-indent-no-longer-is-experimental'
Doc update. * cn/diff-indent-no-longer-is-experimental: diff: --indent-heuristic is no longer experimental
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index a88c767..dd0dba5 100644
--- 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[]
-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