From: Junio C Hamano Date: Fri, 30 Oct 2026 19:31:07 GMT Subject: Re: [PATCH v5] doc: git-rebase: update incompatible options Message-ID: In-Reply-To: <20261030192719.8KtoR%taahol@utu.fi> Tuomas Ahola writes: >> 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. > > 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.