From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Dec 2007 06:49:58 +0000 (-0800)
Subject: Merge branch 'jc/color'
X-Git-Tag: v1.5.4-rc0~108
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd390763d487c140570ced10ac0d955908072fc6;p=git.git

Merge branch 'jc/color'

* jc/color:
  git-config --get-color: get configured color
  "color.diff = true" is not "always" anymore.
---

cd390763d487c140570ced10ac0d955908072fc6