aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-annotate.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 12:05:04 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-15 12:05:04 +0900
commitda2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746 (patch)
treedc9f1a979f9f960ab2962104fe69340bebc12a85 /Documentation/git-annotate.txt
parent74ef46558ea98f4e24d1016c9961eb3d0d372be2 (diff)
parentbab76141da04ab094ece449e2127ef43a8fa60c8 (diff)
downloadgit-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-annotate.txt')
-rw-r--r--Documentation/git-annotate.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 94be4b85e0..05fd482b74 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -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
--------