git config doc: fix recent ASCIIDOC formatting regression

avar · gitster · commit 8464b2d1d86b · 2021-10-20T10:55:09.000-07:00
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,9 @@ date settings, starting and ending with a color, the dates should be`
`17`	`17`	`set from oldest to newest. The metadata will be colored with the`
`18`	`18`	`specified colors if the line was introduced before the given`
`19`	`19`	`timestamp, overwriting older timestamped colors.`
`20`		`-`
`21`	`20`	`+`
`22`	`21`	`Instead of an absolute timestamp relative timestamps work as well,`
`23`	`22`	e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
`24`		`-`
`25`	`23`	`+`
`26`	`24`	It defaults to `blue,12 month ago,white,1 month ago,red`, which
`27`	`25`	`colors everything older than one year blue, recent changes between`