From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:16:58 +0000 (-0800)
Subject: Merge branch 'jk/colors-fix' into maint
X-Git-Tag: v2.2.2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d509d5e1cf1feb9e218b431f4ea41b10e39d06e;p=thirdparty%2Fgit.git

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
---

5d509d5e1cf1feb9e218b431f4ea41b10e39d06e