Merge branch 'lr/git-run-setup-gently'

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

Junio C Hamano committed Jun 3, 2014 at 12:06 UTC 22e91ba81538010e471855889b3272195c663d94

No changes.