| commit | 7d718c552b8fa084f2d5bb9c3e3872cfe558a1eb | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 25 Jan 2023 04:03:46 +0000 (25 04:03 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jan 2023 17:20:52 +0000 (25 09:20 -0800) | ||
| tree | 198b39c671fb8b90e391409ba980d0720f15a77a | treesnapshot (tar.gz zip) |
| parent | 1207599e839bd9311ec506d82cd507e820767e9b | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t3422-rebase-incompatible-options.sh | diffblobblamehistory |