diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:16:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:16:58 (GMT) |
| commit | 5d509d5e1cf1feb9e218b431f4ea41b10e39d06e (patch) | |
| tree | 7c40aabc32458afa6500d585abff62acf4163b5d /Documentation | |
| parent | 447c39a9b25e222a96711f7736078e4f33001388 (diff) | |
| parent | cb357221a402c55b23bf99ec9f3b361709d45fa7 (diff) | |
| download | git-5d509d5e1cf1feb9e218b431f4ea41b10e39d06e.zip git-5d509d5e1cf1feb9e218b431f4ea41b10e39d06e.tar.gz git-5d509d5e1cf1feb9e218b431f4ea41b10e39d06e.tar.bz2 | |
Merge branch 'jk/colors-fix' into maint
"git config --get-color" did not parse its command line arguments
carefully.
* 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')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 302d61e..9335ff2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -850,6 +850,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. |