Re: [RFC/PATCH] rebase: use reflog to find common base with upstream

From: Martin von Zweigbergk <martinvonz@gmail.com>
Date: Dec 8, 2013, 23:34 UTC
Message-ID: <CANiSa6hnHdC5Rk9gBZd=9Hr74wjnnjrsoagwsv=HLQb5CM0AEg@mail.gmail.com>
In-Reply-To: <9e5fa57b027e1a5cd11a456c14f43b64f8f5386c.1386531376.git.john@keeping.me.uk>

On Sun, Dec 8, 2013 at 12:06 PM, John Keeping <john@keeping.me.uk> wrote:

Show 11 quoted lines

> Commit 15a147e (rebase: use @{upstream} if no upstream specified,
> 2011-02-09) says:
>
>         Make it default to 'git rebase @{upstream}'. That is also what
>         'git pull [--rebase]' defaults to, so it only makes sense that
>         'git rebase' defaults to the same thing.
>
> but that isn't actually the case.  Since commit d44e712 (pull: support
> rebased upstream + fetch + pull --rebase, 2009-07-19), pull has actually
> chosen the most recent reflog entry which is an ancestor of the current
> branch if it can find one.

In my mind, 'git pull --rebase' does default to @{u}, it just started interpreting it differently in d44e712, but maybe I'm just being defensive :-).

In a similar way, I think your patch is about interpreting the upstream argument differently, not about changing the default upstream argument. This is why I think "git rebase" and "git rebase origin/master" should be the same (when origin/master is the configured upstream).