From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:05 +0000 (-0700)
Subject: Merge branch 'ah/doc-pretty-color-auto-prefix' into maint
X-Git-Tag: v2.13.3~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/76de71b4879003ce2c2a7f9ac22e059183e00e11?hp=cf77911ae51b95bb6cd92216e6ff1a1afc60b3cc

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
---

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