From: Junio C Hamano Date: Tue, 20 Oct 2026 02:29:18 GMT Subject: Re: [PATCH v2] doc: git-rebase: Update incompatible options Message-ID: In-Reply-To: <20261019143546.207295-1-omri.sarig13@gmail.com> Omri Sarig writes: > Subject: Re: [PATCH v2] doc: git-rebase: Update incompatible options Downcase "Update" here. > Several options in the rebase man page link to the "INCOMPATIBLE > OPTIONS" section when the option is 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, `--onto` doesn't link to the INCOMPATIBLE OPTIONS section, even > though it is incompatible with `--keep-base`. > > Update the description of these option, to have correct references to > the INCOMPATIBLE OPTIONS section. > > Signed-off-by: Omri Sarig > --- > I was not sure if both adding INCOMPATIBLE OPTIONS (--onto) and removing them > (the other flags) belong in the same commit, or in 2 separate commits. These > changes felt small enough to me to not require a second commit, but please let > me know if it's preferred. I'll happily send a new patch where these changes > are split across different commits. They both fall into "update the stale list of incompatible options to code's reality", which the title of the patch claims to do, so I see no issues there.