summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-04-18 23:08:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-18 23:28:28 (GMT)
commita95f067e3fc2b7c50c69680ac10bef528b160446 (patch)
treedfb852b29647d69cd69b2a4304da33a8028ac3cc /Documentation
parentfcabc2d91cd5f2c9b92e461907d0155265ec0633 (diff)
downloadgit-a95f067e3fc2b7c50c69680ac10bef528b160446.zip
git-a95f067e3fc2b7c50c69680ac10bef528b160446.tar.gz
git-a95f067e3fc2b7c50c69680ac10bef528b160446.tar.bz2
pretty: add %C(auto) for auto-coloring
This is not simply convenient over %C(auto,xxx). Some placeholders (actually only one, %d) do multi coloring and we can't emit a multiple colors with %C(auto,xxx). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 6bde67e..bad627a 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -156,7 +156,8 @@ The placeholders are:
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)
+ 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 '%'