| commit | 3d5fc24daefbdf56bc36a491aed0b7990fa0c62f | |
| author | Alex Henrie <alexhenrie24@gmail.com> | |
| Wed, 21 Jul 2021 01:42:19 +0000 (21 01:42 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Jul 2021 04:43:12 +0000 (20 21:43 -0700) | ||
| tree | ef359b69c3e219588b10455b6fe7d89976df9f93 | treesnapshot (tar.gz zip) |
| parent | 1d25e5bdf5263a227d233eafcf028b36c72716f6 | commitdiff |
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>
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>
| advice.c | diffblobblamehistory | |
| advice.h | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory | |
| builtin/pull.c | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |