Merge branch 'lr/git-run-setup-gently'
commit22e91ba81538010e471855889b3272195c663d94
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700)
tree4ee15ed8f98b480c37530c5447867bb5827ecea8
parent3a9dae783bb66c18409d42d07949456dde8c4c62
parent27bd38d4e5a44da233a9e7d01c6a518aba355297
Merge branch 'lr/git-run-setup-gently'

* lr/git-run-setup-gently:
  git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
git.c