summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-21 16:50:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-21 16:50:34 -0800
commit35e6afd4c6bc73cba7bc279ff43b498389bf805a (patch)
tree9fb4d4137ada34fa48e2424ce56b52879a637611 /Documentation
parentMerge branch 'jc/maint-format-patch-o-relative' (diff)
parentOptimize color_parse_mem (diff)
downloadtgif-35e6afd4c6bc73cba7bc279ff43b498389bf805a.tar.xz
Merge branch 'jk/color-parse'
* jk/color-parse: Optimize color_parse_mem expand --pretty=format color options color: make it easier for non-config to parse color specs
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-formats.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 0a8a948e6f..3d87d3edd5 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -124,6 +124,7 @@ 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
- '%m': left, right or boundary mark
- '%n': newline
- '%x00': print a byte from a hex code