Skip to content

Commit 8464b2d

Browse files
avargitster
authored andcommitted
git config doc: fix recent ASCIIDOC formatting regression
Fix a regression in 8c32856 (blame: document --color-* options, 2021-10-08), which added an extra newline before the "+" syntax. The "Documentation/doc-diff HEAD~ HEAD" output with this applied is: [...] @@ -1815,13 +1815,13 @@ CONFIGURATION FILE 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. + 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 one month - and one year old are kept white, and lines introduced within the last - month are colored red. + It defaults to blue,12 month ago,white,1 month ago,red, which + colors everything older than one year blue, recent changes between + one month and one year old are kept white, and lines introduced + within the last month are colored red. color.blame.repeatedLines Use the specified color to colorize line annotations for git blame Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8c32856 commit 8464b2d

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

Documentation/config/color.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ date settings, starting and ending with a color, the dates should be
1717
set from oldest to newest. The metadata will be colored with the
1818
specified colors if the line was introduced before the given
1919
timestamp, overwriting older timestamped colors.
20-
2120
+
2221
Instead of an absolute timestamp relative timestamps work as well,
2322
e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
24-
2523
+
2624
It defaults to `blue,12 month ago,white,1 month ago,red`, which
2725
colors everything older than one year blue, recent changes between

0 commit comments

Comments
 (0)