summaryrefslogtreecommitdiff
path: root/Documentation/git-blame.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-15 12:05:04 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-15 12:05:04 +0900
commitda2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746 (patch)
treedc9f1a979f9f960ab2962104fe69340bebc12a85 /Documentation/git-blame.txt
parentMerge branch 'js/mingw-redirect-std-handles' into maint (diff)
parentdiff: --indent-heuristic is no longer experimental (diff)
downloadtgif-da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746.tar.xz
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
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
--------------------