Andrew's git / gitweb.git / diff
?
Merge branch 'lr/git-run-setup-gently'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
* lr/git-run-setup-gently:
git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive

1  2 
git.c patch | diff1 | diff2 | blob | history
diff --cc git.c
Simple merge