Merge branch 'rs/c-auto-resets-attributes'

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index ba5417567c4df286a95a99cf1ae3e02ee466458f..9dccb3319b2f5faa0ca7fd36b365f30cce5d3e89 100644 (file)
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -89,6 +89,8 @@ 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
 --------------------