diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2016-09-05 11:44:53 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-19 10:25:11 -0700 |
| commit | 5b162879e93dab3b4bcd66afdbea3a96660abd7d (patch) | |
| tree | 409c0b32b3ff0ae9be653d723900fc61c8eb909c /t/t7607-merge-overwrite.sh | |
| parent | parse-options: add parse_opt_unknown_cb() (diff) | |
| download | tgif-5b162879e93dab3b4bcd66afdbea3a96660abd7d.tar.xz | |
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 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions