From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Dec 2014 22:31:38 +0000 (-0800)
Subject: Merge branch 'jk/colors-fix'
X-Git-Tag: v2.3.0-rc0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e886efdb342cee6722762e654ddc1fdee37315b5;p=thirdparty%2Fgit.git

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

e886efdb342cee6722762e654ddc1fdee37315b5