diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:23 -0700 |
| commit | c4e0d011f9987b95725cbbd146a5141b83857a40 (patch) | |
| tree | 2cc620046654e16bdc2c4fe99c5de42317bd0154 /Documentation | |
| parent | ad0e95980c10237726724a4970bfca13ef7d73cb (diff) | |
| parent | 30cfe72d37ed8c174cae43923769730a94549dae (diff) | |
| download | git-c4e0d011f9987b95725cbbd146a5141b83857a40.tar.gz git-c4e0d011f9987b95725cbbd146a5141b83857a40.tar.xz | |
Merge branch 'rs/pretty-format-color-doc-fix'
* rs/pretty-format-color-doc-fix:
pretty: fix document link for color specification
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-formats.txt | 3 |
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 |