summaryrefslogtreecommitdiff
path: root/Documentation/git-blame.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-06 13:11:27 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-06 13:11:27 +0900
commit662ac3b3a8a16fd749b598c85c4d8bfea5bb208e (patch)
treedf06d7c450c987d4f94c8e5b9ae1ccf109ef077d /Documentation/git-blame.txt
parent2502f018f4cc514b75bdd50c20695d8a35e1d0b5 (diff)
parentbab76141da04ab094ece449e2127ef43a8fa60c8 (diff)
downloadgit-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.tar.gz
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/git-blame.txt')
-rw-r--r--Documentation/git-blame.txt2
1 files changed, 0 insertions, 2 deletions
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
--------------------