From: Omri Sarig <omri.sarig13@gmail.com>
To: omri.sarig13@gmail.com, taahol@utu.fi
Cc: git@vger.kernel.org, gitster@pobox.com, julia@jvns.ca,
me@linux.beauty, phillip.wood@dunelm.org.uk
Subject: [PATCH v5] doc: git-rebase: update incompatible options
Date: Fri, 30 Oct 2026 17:38:41 +0100 [thread overview]
Message-ID: <20261030163841.31840-1-omri.sarig13@gmail.com> (raw)
In-Reply-To: <20261025110759.204336-1-omri.sarig13@gmail.com>
A few options in the rebase manual page link to the "INCOMPATIBLE
OPTIONS" section, but they are no longer incompatible with any other
option:
- Commit 1a66d8c6f6 (rebase: remove --allow-empty-message from
incompatible opts, 2023-01-25) removed "--allow-empty-message" from
the INCOMPATIBLE OPTIONS section, but did not remove the link to that
section from the option description.
- Commit a74b35081c (rebase: drop support for `--preserve-merges`,
2021-09-07) removed the `--preserve-merges` option from rebase, which
removes all incompatbiilty references to `--ignore-date,
--reset-author-date` and `--signoff`.
Additionally, since 414d924beb (rebase: teach rebase --keep-base,
2019-08-27) the `--onto` option is incompatible with `--keep-base`, but
doesn't link to the INCOMPATIBLE OPTIONS section.
Update the description of these options, to have correct references to
the INCOMPATIBLE OPTIONS section.
Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>
---
Thank you for the review!
Changes in V2:
- Update commit message per the review comments from Phillip (Thanks for the
review!).
- Add `--onto` to INCOMPATIBLE OPTIONS.
Changes in V3:
- Downcase "Update" in commit title
Changes in V4:
- Update the commit message per review comments.
- Rebase the patch to be compatible with the maint branch.
Changes in V5:
- Update commit message, making it clear that the `--onto` option was only
missing the INCOMPATIBLE OPTIONS link.
Documentation/git-rebase.adoc | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc
index f6c22d1598..f1f675d311 100644
--- a/Documentation/git-rebase.adoc
+++ b/Documentation/git-rebase.adoc
@@ -217,6 +217,8 @@ OPTIONS
As a special case, you may use "A\...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD.
++
+See also INCOMPATIBLE OPTIONS below.
See TRANSPLANTING A TOPIC BRANCH WITH --ONTO above for examples.
@@ -332,8 +334,6 @@ See also INCOMPATIBLE OPTIONS below.
and this option would override that behavior, allowing commits
with empty messages to be rebased. Now commits with an empty
message do not cause rebasing to halt.
-+
-See also INCOMPATIBLE OPTIONS below.
-m::
--merge::
@@ -487,15 +487,11 @@ applying (in terms of the author date).
Instead of using the author date of the original commit, use
the current time as the author date of the rebased commit. This
option implies `--force-rebase`.
-+
-See also INCOMPATIBLE OPTIONS below.
--signoff::
Add a `Signed-off-by` trailer to all the rebased commits. Note
that if `--interactive` is given then only commits marked to be
picked, edited or reworded will have the trailer added.
-+
-See also INCOMPATIBLE OPTIONS below.
--trailer=<trailer>::
Append the given trailer to every rebased commit message, processed
next prev parent reply other threads:[~2026-10-30 16:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-25 11:07 [PATCH v4] doc: git-rebase: update incompatible options Omri Sarig
2026-10-29 8:03 ` Tuomas Ahola
2026-10-30 16:38 ` Omri Sarig [this message]
2026-10-30 19:27 ` [PATCH v5] " Tuomas Ahola
2026-10-30 19:31 ` Junio C Hamano
2026-10-30 19:57 ` Tuomas Ahola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261030163841.31840-1-omri.sarig13@gmail.com \
--to=omri.sarig13@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=julia@jvns.ca \
--cc=me@linux.beauty \
--cc=phillip.wood@dunelm.org.uk \
--cc=taahol@utu.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox