diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:53 -0800 |
| commit | ca9103d15deebf875e8d563e0968ba2e95c19d35 (patch) | |
| tree | 619ba6110a1fbf567d3b11563f6f4d77b58c3eae /Documentation/pretty-formats.txt | |
| parent | Merge branch 'sg/ci-parallel-build' (diff) | |
| parent | doc: prevent overflowing <code> tag in rendered HTML (diff) | |
| download | tgif-ca9103d15deebf875e8d563e0968ba2e95c19d35.tar.xz | |
Merge branch 'kl/pretty-doc-markup-fix'
Doc update.
* kl/pretty-doc-markup-fix:
doc: prevent overflowing <code> tag in rendered HTML
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index de6953108c..7bfffae765 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -183,7 +183,7 @@ endif::git-rev-list[] `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., - `%C(auto,red)`). Specifying `%C(always,...) will show the colors + `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` |