From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Dec 2007 07:43:47 +0000 (-0800)
Subject: Merge branch 'jc/addi-color'
X-Git-Tag: v1.5.4-rc0~60
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ca7325621a1792463fdd3bd40a4e5dc766115ad7;p=git.git

Merge branch 'jc/addi-color'

* jc/addi-color:
  config --get-colorbool: diff.color is a deprecated synonym to color.diff
  Color support for "git-add -i"
  git config --get-colorbool
---

ca7325621a1792463fdd3bd40a4e5dc766115ad7