diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:04 -0800 |
| commit | 72ecc6ef53cb2906f5efab11fa6ab26c1729f233 (patch) | |
| tree | 3de468d4246144d09a85c65abcce0aa5140cb42e /xdiff/xutils.h | |
| parent | Merge branch 'jc/exec-cmd-system-path-leak-fix' (diff) | |
| parent | t5516: more tests for receive.denyCurrentBranch=updateInstead (diff) | |
| download | tgif-72ecc6ef53cb2906f5efab11fa6ab26c1729f233.tar.xz | |
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
Diffstat (limited to 'xdiff/xutils.h')
0 files changed, 0 insertions, 0 deletions