| commit | 6f843a3355ee590dfe09eb90679051e75fadf675 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 22 Jul 2021 05:04:50 +0000 (22 05:04 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Jul 2021 18:54:30 +0000 (22 11:54 -0700) | ||
| tree | 2cd08ff9b4f2e00854a2ad665aa14734ecafd044 | treesnapshot (tar.gz zip) |
| parent | 359ff6938990a438b99e95fe36b6b359f3eb9811 | commitdiff |
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>
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>
| builtin/pull.c | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |