Merge branch 'bs/doc-blame-color-lines'

[thirdparty/git.git] / Documentation / blame-options.txt

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 117f4cf80645e13b991534318ed7d7eb33e62fa1..9a663535f443c0f46a0a244c4dc454acdf5ffdef 100644 (file)
--- 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.