Merge branch 'mm/color-auto-default'
commit6a5b9ce5e12f039b126b1c97be7ba1b63ace5149
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:10 +0000 (22 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:10 +0000 (22 11:23 -0700)
tree9248151be0217a816ebbeca90f49ada9b74b951e
parent06cbc13c6cb8867af1127ac52e005b3c36506320
parent7f3b8c628eaea8ccbe83f605b00d629553b70b42
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
builtin/add.c