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)
commitcd390763d487c140570ced10ac0d955908072fc6
tree5e4ecc6f57c830646af9ca482c35fbe1f82d4d6a
parentee0d7946400fe773e453ab6ad8b94ae87315be69
parent9ce0352258a421b654b5db145a42d07cbaef416c
Merge branch 'jc/color'

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