diff options
| author |  Alex Henrie <alexhenrie24@gmail.com> | 2021-07-21 01:42:19 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-20 21:43:12 -0700 |
| commit | 3d5fc24daefbdf56bc36a491aed0b7990fa0c62f (patch) | |
| tree | ef359b69c3e219588b10455b6fe7d89976df9f93 /archive.c | |
| parent | t7601: add tests of interactions with multiple merge heads and config (diff) | |
| download | tgif-3d5fc24daefbdf56bc36a491aed0b7990fa0c62f.tar.xz | |
pull: abort if --ff-only is given and fast-forwarding is impossible
The warning about pulling without specifying how to reconcile divergent
branches says that after setting pull.rebase to true, --ff-only can
still be passed on the command line to require a fast-forward. Make that
actually work.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
[en: updated tests; note 3 fixes and 1 new failure]
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.c')
0 files changed, 0 insertions, 0 deletions