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

gitster · gitster · commit 9ff67749fbca · 2021-10-29T15:43:12.000-07:00
Doc fix.

* bs/doc-blame-color-lines:
  git config doc: fix recent ASCIIDOC formatting regression
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`