summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-12 14:31:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-12 14:31:39 -0800
commite886efdb342cee6722762e654ddc1fdee37315b5 (patch)
treee1298d35a6602cddaccb2dca0bb9835e74d30dbe /Documentation/config.txt
parentMerge branch 'rt/push-recurse-submodule-usage-string' (diff)
parentt4026: test "normal" color (diff)
downloadtgif-e886efdb342cee6722762e654ddc1fdee37315b5.tar.xz
Merge branch 'jk/colors-fix'
* jk/colors-fix: t4026: test "normal" color config: fix parsing of "git config --get-color some.key -1" docs: describe ANSI 256-color mode
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 922072596f..f615a5c354 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -839,6 +839,10 @@ accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
`blink` and `reverse`. The first color given is the foreground; the
second is the background. The position of the attribute, if any,
doesn't matter.
++
+Colors (foreground and background) may also be given as numbers between
+0 and 255; these use ANSI 256-color mode (but note that not all
+terminals may support this).
color.diff::
Whether to use ANSI escape sequences to add color to patches.