rebase: remove --allow-empty-message from incompatible opts

--allow-empty-message was turned into a no-op and even documented
as such; the flag is simply ignored.  Since the flag is ignored, it
shouldn't be documented as being incompatible with other flags.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2023-01-25 04:03:47 +00:00 committed by Junio C Hamano
parent 7d718c552b
commit 1a66d8c6f6

View File

@ -647,7 +647,6 @@ are incompatible with the following options:
* --merge
* --strategy
* --strategy-option
* --allow-empty-message
* --[no-]autosquash
* --rebase-merges
* --interactive