From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 06 Sep 2013 21:41:38 GMT
Subject: Re: [PATCH 0/3] Reject non-ff pulls by default
Message-ID: <20130906214138.GA7470@google.com>
In-Reply-To: <20130905192646.GG2582@serenity.lan>

John Keeping wrote:
> On Thu, Sep 05, 2013 at 12:18:45PM -0700, Junio C Hamano wrote:

>> I somehow thought that rebase by default looked in the reflog to do
>> exactly that. Perhaps I am not remembering correctly.
>
> It just does @{upstream} by default, which tends to get messy if the
> upstream has been rewritten.

Maybe Junio is thinking of 'git pull --rebase', which walks the reflog
until it finds an ancestor of the current branch and uses that as the
<upstream> parameter to rebase.