diff options
| author | Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 18:54:30 (GMT) |
| commit | 6f843a3355ee590dfe09eb90679051e75fadf675 (patch) | |
| tree | 2cd08ff9b4f2e00854a2ad665aa14734ecafd044 /advice.h | |
| parent | 359ff6938990a438b99e95fe36b6b359f3eb9811 (diff) | |
| download | git-6f843a3355ee590dfe09eb90679051e75fadf675.zip git-6f843a3355ee590dfe09eb90679051e75fadf675.tar.gz git-6f843a3355ee590dfe09eb90679051e75fadf675.tar.bz2 | |
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 'advice.h')
0 files changed, 0 insertions, 0 deletions