aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-29 15:43:12 -0700
committerJunio C Hamano <gitster@pobox.com>2021-10-29 15:43:12 -0700
commit9ff67749fbcac93ab400cf46ef687208b62cf8d0 (patch)
treeeb4b467f953134fe7247705b94d4acd5eb52671b
parentThe fifteenth batch (diff)
parentgit config doc: fix recent ASCIIDOC formatting regression (diff)
downloadgit-9ff67749fbcac93ab400cf46ef687208b62cf8d0.tar.gz
git-9ff67749fbcac93ab400cf46ef687208b62cf8d0.zip
Merge branch 'bs/doc-blame-color-lines'
Doc fix. * bs/doc-blame-color-lines: git config doc: fix recent ASCIIDOC formatting regression
-rw-r--r--Documentation/config/color.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt
index dd2d2e0d84..6e817f6047 100644
--- a/Documentation/config/color.txt
+++ b/Documentation/config/color.txt
@@ -17,11 +17,9 @@ date settings, starting and ending with a color, the dates should be
set from oldest to newest. The metadata will be colored with the
specified colors if the line was introduced before the given
timestamp, overwriting older timestamped colors.
-
+
Instead of an absolute timestamp relative timestamps work as well,
e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
-
+
It defaults to `blue,12 month ago,white,1 month ago,red`, which
colors everything older than one year blue, recent changes between