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
This commit is contained in:
Junio C Hamano 2017-07-10 13:59:05 -07:00
commit 76de71b487

View File

@ -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 '%'