diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:05 -0700 |
| commit | 76de71b4879003ce2c2a7f9ac22e059183e00e11 (patch) | |
| tree | 6319192aa1baca6348545f5c6b9b228c4f4a9e98 /Documentation | |
| parent | cf77911ae51b95bb6cd92216e6ff1a1afc60b3cc (diff) | |
| parent | 8592c95cdfb476dff5c9e18c185289927601236d (diff) | |
| download | git-76de71b4879003ce2c2a7f9ac22e059183e00e11.tar.gz | |
Merge branch 'ah/doc-pretty-color-auto-prefix' into maint
Doc update.
* ah/doc-pretty-color-auto-prefix:
doc: clarify syntax for %C(auto,...) in pretty formats
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-formats.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index a48d267e26..4d6dac5770 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -174,11 +174,12 @@ endif::git-rev-list[] - '%Creset': reset color - '%C(...)': color specification, as described under Values in the "CONFIGURATION FILE" section of linkgit:git-config[1]; - adding `auto,` at the beginning will emit color only when colors are - enabled for log output (by `color.diff`, `color.ui`, or `--color`, and - respecting the `auto` settings of the former if we are going to a - terminal). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring - on the next placeholders until the color is switched again. + adding `auto,` at the beginning (e.g. `%C(auto,red)`) will emit + color only when colors are enabled for log output (by `color.diff`, + `color.ui`, or `--color`, and respecting the `auto` settings of the + former if we are going to a terminal). `auto` alone (i.e. + `%C(auto)`) will turn on auto coloring on the next placeholders + until the color is switched again. - '%m': left (`<`), right (`>`) or boundary (`-`) mark - '%n': newline - '%%': a raw '%' |