Merge branch 'jk/rebase-i-exec-gitdir-fix'

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index fdc3aea30a4cdb480d469455a66e51a76366be93..16323eb80e3108794067c4dbfcbfe25e46938498 100644 (file)
--- 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
 --------------------