diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-10-19 12:31:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-20 17:55:09 (GMT) |
| commit | 8464b2d1d86b4e0c657e1da8b240a675cb68d6d7 (patch) | |
| tree | 7ecc47b008fe2abfec2a19cfbd85aa6ee272e657 /Documentation/config/color.txt | |
| parent | 8c3285613322f5b08c8a2320030f4e74b5032998 (diff) | |
| download | git-8464b2d1d86b4e0c657e1da8b240a675cb68d6d7.zip git-8464b2d1d86b4e0c657e1da8b240a675cb68d6d7.tar.gz git-8464b2d1d86b4e0c657e1da8b240a675cb68d6d7.tar.bz2 | |
git config doc: fix recent ASCIIDOC formatting regression
Fix a regression in 8c328561332 (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>
Diffstat (limited to 'Documentation/config/color.txt')
| -rw-r--r-- | Documentation/config/color.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt index 9fd7c15..4514125 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 |