From 5b162879e93dab3b4bcd66afdbea3a96660abd7d Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 5 Sep 2016 11:44:53 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-annotate.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation/git-annotate.txt') diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt index 05fd482b74..94be4b85e0 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/git-annotate.txt @@ -23,6 +23,7 @@ familiar command name for people coming from other SCM systems. OPTIONS ------- include::blame-options.txt[] +include::diff-heuristic-options.txt[] SEE ALSO -------- -- cgit v1.3-5-g45d5