From: D. Ben Knoble Date: Mon, 22 Dec 2025 21:56:43 GMT Subject: Re: Metadata for merge conflicts during rebase (to aid rustc) and potential for better user experience? Message-ID: In-Reply-To: On Mon, Dec 22, 2025 at 9:31 AM Esteban Küber wrote: > > The questions I have are: > - can I *avoid* `--points-at` in any way to identify what branch we're > rebasing onto? According to "git help rebase", ORIG_HEAD is not reliable but @{1} should be. > - is there already a better way to identify if the rebase was triggered by > `git rebase` or `git pull` (configured to rebase)? I haven't studied the internals on this yet, but I think the common pattern is to look at REBASE_HEAD vs. MERGE_HEAD. > - if neither of the above has a "yes" answer, would git consider *adding* > that information, both for third-parties as well as to extend its own UI? I think "git status" already shows some of this (maybe not the branches in question, but certainly the "it looks like you're in the middle of a rebase/merge/cherry-pick/etc."). -- D. Ben Knoble