From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 18:23:10 +0000 (-0700)
Subject: Merge branch 'mm/color-auto-default'
X-Git-Tag: v1.8.4-rc0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a5b9ce5e12f039b126b1c97be7ba1b63ace5149;p=thirdparty%2Fgit.git

Merge branch 'mm/color-auto-default'

A finishing touch to fix breakage to "add -e" caused by defaulting
ui.color to "auto".

* mm/color-auto-default:
  git add -e: Explicitly specify that patch should have no color
---

6a5b9ce5e12f039b126b1c97be7ba1b63ace5149