Re: [PATCH v6] doc: git-rebase: update incompatible options
- From
Julia Evans <julia@jvns.ca>
- Date
- Nov 10, 2026, 17:59 UTC
- Message-ID
- <b5bf86d8-5a2c-4035-a8c6-f6e8c44cf7de@app.fastmail.com>
- In-Reply-To
- <b77fcd1c-21aa-4029-91d2-38c89a53f788@gmail.com>
Show 22 quoted lines
>>> +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.
Ah, I hadn't read that part of the thread, sorry about that! I'm not familiar with the process around the `maint` branch so I definitely don't have opinions about how that should work.
Thanks for explaining it!