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

Junio C Hamano committed Dec 22, 2014 at 12:16 UTC 5d509d5e1cf1feb9e218b431f4ea41b10e39d06e

No changes.