summaryrefslogtreecommitdiffstats
path: root/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
commitabad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch)
tree85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /pretty-formats.txt
parent085534867cb82e0690945a1645554999bcfa542a (diff)
downloadgit-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'pretty-formats.txt')
-rw-r--r--pretty-formats.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/pretty-formats.txt b/pretty-formats.txt
index d9eddedc7..105f18a6f 100644
--- a/pretty-formats.txt
+++ b/pretty-formats.txt
@@ -144,7 +144,11 @@ The placeholders are:
- '%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 in color.branch.* config option;
+ 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)
- '%m': left, right or boundary mark
- '%n': newline
- '%%': a raw '%'