Elijah Newren 6f843a3355 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>

2021-07-22 11:54:30 -07:00

32 KiB

Raw Blame History

View Raw