Merge branch 'jk/colors-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2014 22:31:38 +0000 (14:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2014 22:31:39 +0000 (14:31 -0800)
commite886efdb342cee6722762e654ddc1fdee37315b5
treee1298d35a6602cddaccb2dca0bb9835e74d30dbe
parentbb87344a74119abeb2ca8c7f42f89ccad1ba6e32
parentcb357221a402c55b23bf99ec9f3b361709d45fa7
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
Documentation/config.txt
builtin/config.c