Merge branch 'jc/color'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 06:49:58 +0000 (22:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 06:49:58 +0000 (22:49 -0800)
* jc/color:
  git-config --get-color: get configured color
  "color.diff = true" is not "always" anymore.


Trivial merge