]> Kevux Git Server - rit/commit
projects / rit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1207599) | patch
rebase: flag --apply and --merge as incompatible
authorElijah Newren <newren@gmail.com>
Wed, 25 Jan 2023 04:03:46 +0000 (04:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jan 2023 17:20:52 +0000 (09:20 -0800)
commit7d718c552b8fa084f2d5bb9c3e3872cfe558a1eb
tree198b39c671fb8b90e391409ba980d0720f15a77atree | snapshot
parent1207599e839bd9311ec506d82cd507e820767e9bcommit | diff
rebase: flag --apply and --merge as incompatible

Previously, we flagged options which implied --apply as being
incompatible with options which implied --merge.  But if both options
were given explicitly, then we didn't flag the incompatibility.  The
same is true with --apply and --interactive.  Add the check, and add
some testcases to verify these are also caught.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c diff | blob | history
t/t3422-rebase-incompatible-options.sh diff | blob | history
Git without Rust.