summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:08 -0800
commit24abb31727e8e0b216bdee182dbbbbc43d134fa6 (patch)
treece40204a36f89e5344b906918238495954cef4db /t/t7611-merge-abort.sh
parentMerge branch 'ls/clean-smudge-override-in-config' (diff)
parentpush: fix ref status reporting for --force-with-lease (diff)
downloadtgif-24abb31727e8e0b216bdee182dbbbbc43d134fa6.tar.xz
Merge branch 'aw/push-force-with-lease-reporting'
"git push --force-with-lease" has been taught to report if the push needed to force (or fast-forwarded). * aw/push-force-with-lease-reporting: push: fix ref status reporting for --force-with-lease
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions