aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:23 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:23 -0700
commit4efd8e64d3c806b840d1e167762861d8154cd7ed (patch)
tree891f14920931377327f716c16c419fd2ef4147a1 /Documentation
parent9a82d8fd0b778664c5178b27b17a5dbbac5e9d21 (diff)
parent30cfe72d37ed8c174cae43923769730a94549dae (diff)
downloadgit-4efd8e64d3c806b840d1e167762861d8154cd7ed.tar.gz
git-4efd8e64d3c806b840d1e167762861d8154cd7ed.tar.xz
Merge branch 'rs/pretty-format-color-doc-fix' into maint
Small doc update. * rs/pretty-format-color-doc-fix: pretty: fix document link for color specification
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-formats.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index a942d57f7..69c289dd0 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -166,7 +166,8 @@ endif::git-rev-list[]
- '%Cgreen': switch color to green
- '%Cblue': switch color to blue
- '%Creset': reset color
-- '%C(...)': color specification, as described in color.branch.* config option;
+- '%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