From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Mar 2010 20:44:06 +0000 (-0800)
Subject: Merge branch 'ml/color-when'
X-Git-Tag: v1.7.1-rc0~123
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c06951894ac943b2aaa288b0e9dc1eb605dfb7b6;p=git.git

Merge branch 'ml/color-when'

* ml/color-when:
  Add an optional argument for --color options
---

c06951894ac943b2aaa288b0e9dc1eb605dfb7b6