Merge branch 'js/push-to-deploy'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:03 +0000 (12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:04 +0000 (12:27 -0800)
commit72ecc6ef53cb2906f5efab11fa6ab26c1729f233
tree3de468d4246144d09a85c65abcce0aa5140cb42e
parent6bcaff1a4fe4a3088348e706c149941c74d1ad61
parent4d7a5ceacc97e69c4ab5e1543f61fafafb963a9c
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
Documentation/config.txt
builtin/receive-pack.c