aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/blame-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-18 15:47:58 -0700
committerJunio C Hamano <gitster@pobox.com>2021-10-18 15:47:58 -0700
commit871e42eb0996ff43a11faf47c6c05f869c4bb72c (patch)
tree4374c5aeefb3383900dafbb7560a0397e4bcc755 /Documentation/blame-options.txt
parenta86ed75f32a38d3496fedb2be52816aa36472db1 (diff)
parent8c3285613322f5b08c8a2320030f4e74b5032998 (diff)
downloadgit-871e42eb0996ff43a11faf47c6c05f869c4bb72c.tar.gz
Merge branch 'bs/doc-blame-color-lines'
The "--color-lines" and "--color-by-age" options of "git blame" have been missing, which are now documented. * bs/doc-blame-color-lines: blame: document --color-* options blame: describe default output format
Diffstat (limited to 'Documentation/blame-options.txt')
-rw-r--r--Documentation/blame-options.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 117f4cf806..9a663535f4 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -136,5 +136,16 @@ take effect.
option. An empty file name, `""`, will clear the list of revs from
previously processed files.
+--color-lines::
+ Color line annotations in the default format differently if they come from
+ the same commit as the preceding line. This makes it easier to distinguish
+ code blocks introduced by different commits. The color defaults to cyan and
+ can be adjusted using the `color.blame.repeatedLines` config option.
+
+--color-by-age::
+ Color line annotations depending on the age of the line in the default format.
+ The `color.blame.highlightRecent` config option controls what color is used for
+ each range of age.
+
-h::
Show help message.