Re: Metadata for merge conflicts during rebase (to aid rustc) and potential for better user experience?

From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Dec 22, 2025, 21:56 UTC
Message-ID: <CALnO6CAYaOQBOg+8pUZk95frML5tod+N_n3avxASRL10sLtwwA@mail.gmail.com>
In-Reply-To: <CAHnEOG2o784dk+OpkGt-1qjRJb34=sFMJvh-JRJ3v+GNBxFywQ@mail.gmail.com>

On Mon, Dec 22, 2025 at 9:31 AM Esteban Küber <esteban@kuber.com.ar> 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