]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06cbc13 7f3b8c6)
Merge branch 'mm/color-auto-default'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:10 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:10 +0000 (11:23 -0700)
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

1  2 
builtin/add.c patch | diff1 | diff2 | blob | history

diff --cc builtin/add.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.