| commit | 5b162879e93dab3b4bcd66afdbea3a96660abd7d | |
| author | Michael Haggerty <mhagger@alum.mit.edu> | |
| Mon, 5 Sep 2016 09:44:53 +0000 (5 11:44 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Sep 2016 17:25:11 +0000 (19 10:25 -0700) | ||
| tree | 409c0b32b3ff0ae9be653d723900fc61c8eb909c | treesnapshot (tar.gz zip) |
| parent | ce564eb1bd541a87152e3546fb7d7a2b460df7ed | commitdiff |
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>
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>