From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:43 +0000 (-0700)
Subject: Merge branch 'lr/git-run-setup-gently'
X-Git-Tag: v2.1.0-rc0~192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e91ba81538010e471855889b3272195c663d94;p=thirdparty%2Fgit.git

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

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

22e91ba81538010e471855889b3272195c663d94