summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 22:57:51 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 22:57:51 +0900
commit7d483e9c00516413a9c2dafc24a6ecb40975b02b (patch)
tree54b57d8716409d4bbbd440a7dbe9e305d67bcdf0 /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'js/diff-notice-has-drive-prefix' into maint (diff)
parentreceive: denyCurrentBranch=updateinstead should not blindly update (diff)
downloadtgif-7d483e9c00516413a9c2dafc24a6ecb40975b02b.tar.xz
Merge branch 'jc/receive-deny-current-branch-fix' into maint
The receive.denyCurrentBranch=updateInstead codepath kicked in even when the push should have been rejected due to other reasons, such as it does not fast-forward or the update-hook rejects it, which has been corrected. * jc/receive-deny-current-branch-fix: receive: denyCurrentBranch=updateinstead should not blindly update
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions