Subject: Re: bug: `git pull --rebase` breaks in the presence of pushurls

From: Phillip Wood <[email-masked]>
Date: Thu, 11 Dec 2025 19:39:08 +0000

On 11/12/2025 15:54, Phillip Wood wrote:
> On 11/12/2025 05:35, K Jayatheerth wrote:
> Almost, it uses the reflog of the upstream branch to find the most 
> recent entry that is a descendant of the local branch.

Sorry that should say "is an ancestor of the local branch", it is trying 
to find the upstream reflog entry that the local branch is descended from.

> It then uses that 
> commit to limit the range of commits that get rebased in case the 
> upstream branch has been reset or rewritten. There is a diagram in the 
> documentation [1] which might help.
> 
> Thanks
> 
> Phillip
> 
> [1] https://git-scm.com/docs/git-merge-base#_discussion_on_fork_point_mode
> 
>> Just checking that I’m following correctly
>> before thinking about possible approaches.
>