summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:27:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:27:04 -0800
commit72ecc6ef53cb2906f5efab11fa6ab26c1729f233 (patch)
tree3de468d4246144d09a85c65abcce0aa5140cb42e /diff.c
parentMerge branch 'jc/exec-cmd-system-path-leak-fix' (diff)
parentt5516: more tests for receive.denyCurrentBranch=updateInstead (diff)
downloadtgif-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 'diff.c')
0 files changed, 0 insertions, 0 deletions