diff options
| author | Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-22 11:54:30 -0700 |
| commit | 6f843a3355ee590dfe09eb90679051e75fadf675 (patch) | |
| tree | 2cd08ff9b4f2e00854a2ad665aa14734ecafd044 /commit.c | |
| parent | pull: update docs & code for option compatibility with rebasing (diff) | |
| download | git-6f843a3355ee590dfe09eb90679051e75fadf675.tar.gz git-6f843a3355ee590dfe09eb90679051e75fadf675.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions