git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6] doc: git-rebase: update incompatible options

From
Omri Sarig <omri.sarig13@gmail.com>
Date
Nov 1, 2026, 08:22 UTC
Message-ID
<20261101082230.141688-1-omri.sarig13@gmail.com>
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 which was the
  only one at odds with `--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.
Changes in V6:
- Update the commit message per the review comments, making it clearer.
 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
Previous: Tuomas AholaNext: Omri Sarig
Message 7 of 12 in “doc: git-rebase: update incompatible options”
  1. doc: git-rebase: update incompatible optionsOmri Sarig, Oct 25, 2026
  2. Tuomas AholaOct 29, 2026
  3. doc: git-rebase: update incompatible optionsOmri Sarig, Oct 30, 2026
  4. Tuomas AholaOct 30, 2026
  5. Junio C HamanoOct 30, 2026
  6. Tuomas AholaOct 30, 2026
  7. doc: git-rebase: update incompatible optionsOmri Sarig, Nov 1, 2026
  8. Omri SarigNov 9, 2026
  9. Julia EvansNov 10, 2026
  10. Omri SarigNov 10, 2026
  11. Julia EvansNov 10, 2026
  12. Junio C HamanoNov 10, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.