Merge branch 'jk/colors-fix' into maint
commit5d509d5e1cf1feb9e218b431f4ea41b10e39d06e
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:16:58 +0000 (22 12:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:16:58 +0000 (22 12:16 -0800)
tree7c40aabc32458afa6500d585abff62acf4163b5d
parent447c39a9b25e222a96711f7736078e4f33001388
parentcb357221a402c55b23bf99ec9f3b361709d45fa7
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
Documentation/config.txt
builtin/config.c