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

Re: [PATCH v5] doc: git-rebase: update incompatible options

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 30, 2026, 19:31 UTC
Message-ID
<xmqqse1nugsk.fsf@gitster.g>
In-Reply-To
<20261030192719.8KtoR%taahol@utu.fi>
Tuomas Ahola <taahol@utu.fi> writes:
Show 14 quoted lines
>> Thank you for the review!
>> 
>
> The range-diff against v4 makes it clear that v5 only changed the commit
> message.  Unfortunately, the reroll introduced a new typo:
>
>            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 incompatibility references to `--ignore-date,
>     +      removes all incompatbiilty references to `--ignore-date,
>            --reset-author-date` and `--signoff`.
>      
> Otherwise v5 looks good to me.  Thanks!

I do not quite get what "all incompatibility references" mean, though, with or without typofixes.

Thanks.
Show 5 quoted lines
>
>          Additionally, since 414d924beb (rebase: teach rebase --keep-base,
>          2019-08-27) the `--onto` option is incompatible with `--keep-base`, but
>     -    it is not mentioned in the INCOMPATIBLE OPTIONS section.
>     +    doesn't link to the INCOMPATIBLE OPTIONS section.
Previous: Tuomas AholaNext: Tuomas Ahola
Message 5 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.