From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2016 20:25:23 +0000 (-0700)
Subject: Merge branch 'rs/pretty-format-color-doc-fix'
X-Git-Tag: v2.11.0-rc0~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c4e0d011f9987b95725cbbd146a5141b83857a40?hp=ad0e95980c10237726724a4970bfca13ef7d73cb

Merge branch 'rs/pretty-format-color-doc-fix'

* rs/pretty-format-color-doc-fix:
pretty: fix document link for color specification
---

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index a942d57f73..69c289dd0c 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