summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.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/diff-options.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/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt8
1 files changed, 1 insertions, 7 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3a07f6f..0364061 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,13 +63,7 @@ ifndef::git-format-patch[]
Synonym for `-p --raw`.
endif::git-format-patch[]
---indent-heuristic::
---no-indent-heuristic::
---compaction-heuristic::
---no-compaction-heuristic::
- These are to help debugging and tuning experimental heuristics
- (which are off by default) that shift diff hunk boundaries to
- make patches easier to read.
+include::diff-heuristic-options.txt[]
--minimal::
Spend extra time to make sure the smallest possible