summaryrefslogtreecommitdiff
path: root/t/t9601/cvsroot/module
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-07-22 05:04:50 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-22 11:54:30 -0700
commit6f843a3355ee590dfe09eb90679051e75fadf675 (patch)
tree2cd08ff9b4f2e00854a2ad665aa14734ecafd044 /t/t9601/cvsroot/module
parentpull: update docs & code for option compatibility with rebasing (diff)
downloadtgif-6f843a3355ee590dfe09eb90679051e75fadf675.tar.xz
pull: fix handling of multiple heads
With multiple heads, we should not allow rebasing or fast-forwarding. Make sure any fast-forward request calls out specifically the fact that multiple branches are in play. Also, since we cannot fast-forward to multiple branches, fix our computation of can_ff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9601/cvsroot/module')
0 files changed, 0 insertions, 0 deletions