]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-rebase.txt
rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks
authorElijah Newren <newren@gmail.com>
Wed, 25 Jan 2023 04:03:49 +0000 (04:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jan 2023 17:20:53 +0000 (09:20 -0800)
commitffeaca177ac789942b1db95c334d0eff9c8f12a5
tree80ea70ebea76f87b11fbb34c23806ad2b57bda9f
parentb8ad365640192706e6742f47302e69e7aea62faf
rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks

--[no-]reapply-cherry-picks was traditionally only supported by the
sequencer.  Support was added for the apply backend, when --keep-base is
also specified, in commit ce5238a690 ("rebase --keep-base: imply
--reapply-cherry-picks", 2022-10-17).  Make the code error out when
--[no-]reapply-cherry-picks is specified AND the apply backend is used
AND --keep-base is not specified.  Also, clarify a number of comments
surrounding the interaction of these flags.

Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
builtin/rebase.c
t/t3422-rebase-incompatible-options.sh