summaryrefslogtreecommitdiff
path: root/Documentation/git-blame.txt
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2016-09-05 09:44:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-19 17:25:11 (GMT)
commit5b162879e93dab3b4bcd66afdbea3a96660abd7d (patch)
tree409c0b32b3ff0ae9be653d723900fc61c8eb909c /Documentation/git-blame.txt
parentce564eb1bd541a87152e3546fb7d7a2b460df7ed (diff)
downloadgit-5b162879e93dab3b4bcd66afdbea3a96660abd7d.zip
git-5b162879e93dab3b4bcd66afdbea3a96660abd7d.tar.gz
git-5b162879e93dab3b4bcd66afdbea3a96660abd7d.tar.bz2
blame: honor the diff heuristic options and config
Teach "git blame" and "git annotate" the --compaction-heuristic and --indent-heuristic options that are now supported by "git diff". Also teach them to honor the `diff.compactionHeuristic` and `diff.indentHeuristic` configuration options. It would be conceivable to introduce separate configuration options for "blame" and "annotate"; for example `blame.compactionHeuristic` and `blame.indentHeuristic`. But it would be confusing to users if blame output is inconsistent with diff output, so it makes more sense for them to respect the same configuration. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-blame.txt')
-rw-r--r--Documentation/git-blame.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index ba54175..9dccb33 100644
--- 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
--------------------