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

[PATCH] doc: git-rebase: Update incompatible options

From
Omri Sarig <omri.sarig13@gmail.com>
Date
Oct 18, 2026, 13:25 UTC
Message-ID
<20261018132541.131506-1-omri.sarig13@gmail.com>

Several options in the rebase man page were described as incompatible, where this is no longer the case:

- Commit 1a66d8c6f658051a02b6d8f024e80e06fccdcd11 removed
  `--allow-empty-message` for the incompatible option list, but did not
  update the the documentation of the option itself.
- Commit a74b35081c51adbde3ef01870ba03e859db33be6 removed the
  `--preserve-merges` option from rebase, which removes all
  incompatbiilty references to `--ignore-date, --reset-author-date` and
  `--signoff`.

Update the description of these option, to no longer reference the INCOMPATIBLE OPTIONS section.

Signed-off-by: Omri Sarig <omri.sarig13@gmail.com>
---

I've also found out that the option `--onto` is now mentioned in the INCOMPATIBLE OPTIONS section, but is not referencing it from its own documentation. If this is not intentional, I'll happily send another patch/V2 to address this issue as well.

 Documentation/git-rebase.adoc | 6 ------
 1 file changed, 6 deletions(-)
diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc
index 6536ebdc90..9fd3cf8ce2 100644
--- a/Documentation/git-rebase.adoc
+++ b/Documentation/git-rebase.adoc
@@ -334,8 +334,6 @@ See also <<INCOMPATIBLE_OPTIONS,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,INCOMPATIBLE OPTIONS>> below.
 
 -m::
 --merge::
@@ -489,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,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,INCOMPATIBLE OPTIONS>> below.
 
 --trailer=<trailer>::
 	Append the given trailer to every rebased commit message, processed
Next: Phillip Wood
Message 1 of 2 in “doc: git-rebase: Update incompatible options”
  1. doc: git-rebase: Update incompatible optionsOmri Sarig, Oct 18, 2026
  2. Phillip WoodOct 19, 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.