Re: [PATCH v6] doc: git-rebase: update incompatible options
- From
Omri Sarig <omri.sarig13@gmail.com>
- Date
- Nov 10, 2026, 15:37 UTC
- Message-ID
- <b77fcd1c-21aa-4029-91d2-38c89a53f788@gmail.com>
- In-Reply-To
- <eaa965fa-05fa-4945-aacb-2fc99b02159d@app.fastmail.com>
On 10/11/2026 15.06, Julia Evans wrote:
Show 6 quoted lines
>> @@ -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.
Thank you for looking at it!
> Elsewhere in the document we're now linking to the section like this, > since 2fc11e33820:
As per Junio's request (https://lore.kernel.org/git/xmqqjyncxrur.fsf@gitster.g/), the current version is built over the 'maint' branch, and therefore does not have 2fc11e33820 available yet.
I've discussed whether this update should include the links, or not include them, and understood from Tuomas that the right way to do it here, is to keep the file consistent with itself in the maintenance branch version of it, and update the links everywhere in a future patch (discussed here: https://lore.kernel.org/git/20261029080317.wWchf%25taahol@utu.fi/). Additionally, the INCOMPATIBLE OPTIONS section cannot be a target to a link yet, so this won't apply cleanly to the 'maint' branch with these links.
Please let me know if I should update these links, or keep them consistent with the rest of the file in the 'maint' branch.
Show 7 quoted lines
> > See also <<INCOMPATIBLE_OPTIONS,INCOMPATIBLE OPTIONS>> below. > > I think it would be good to keep things consistent. > > Also it would be good to try to convert up all remaining internal links that > aren't using the << >>, I may try to do that at some point.
As far as I can see, the only place that does not have a link to the INCOMPATIBLE OPTIONS section in the master branch is the --trailer option.
If you want me to, I'll happily update the added section, together with the trailer options, once both are merge.
Thanks, Omri