diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:46 +0900 |
| commit | 4c7f5440225aba8f0c7253575e5ffa933a267de7 (patch) | |
| tree | 498a09bea3303497ac2c101b79371538b188aeae /git-gui/lib/win32_shortcut.js | |
| parent | 5742ba504c04420446556a389e5b99e6b228d928 (diff) | |
| parent | b072a25fad21b8aecfa29f6ffb813a0a6194a764 (diff) | |
Merge branch 'jc/receive-deny-current-branch-fix'
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 'git-gui/lib/win32_shortcut.js')
0 files changed, 0 insertions, 0 deletions