From: Elijah Newren <newren@gmail.com>
Date: Wed, 25 Jan 2023 04:03:47 +0000 (+0000)
Subject: rebase: remove --allow-empty-message from incompatible opts
X-Git-Tag: v2.40.0-rc0~38^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a66d8c6f658051a02b6d8f024e80e06fccdcd11;p=thirdparty%2Fgit.git

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>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6490bc96a1..7d01d1412d 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -647,7 +647,6 @@ are incompatible with the following options:
  * --merge
  * --strategy
  * --strategy-option
- * --allow-empty-message
  * --[no-]autosquash
  * --rebase-merges
  * --interactive