From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:27:03 +0000 (-0800)
Subject: Merge branch 'js/push-to-deploy'
X-Git-Tag: v2.3.0-rc0~65
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/72ecc6ef53cb2906f5efab11fa6ab26c1729f233

Merge branch 'js/push-to-deploy'

"git push" into a repository with a working tree normally refuses
to modify the branch that is checked out.  The command learned to
optionally do an equivalent of "git reset --hard" only when there
is no change to the working tree and the index instead, which would
be useful to "deploy" by pushing into a repository.

* js/push-to-deploy:
t5516: more tests for receive.denyCurrentBranch=updateInstead
receive-pack: add another option for receive.denyCurrentBranch
---

72ecc6ef53cb2906f5efab11fa6ab26c1729f233