diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 09:20:52 -0800 |
| commit | 7d718c552b8fa084f2d5bb9c3e3872cfe558a1eb (patch) | |
| tree | 198b39c671fb8b90e391409ba980d0720f15a77a /Documentation | |
| parent | 1207599e839bd9311ec506d82cd507e820767e9b (diff) | |
| download | git-7d718c552b8fa084f2d5bb9c3e3872cfe558a1eb.tar.gz | |
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>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions