From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 06 Sep 2013 22:14:25 GMT
Subject: Re: [PATCH 0/3] Reject non-ff pulls by default
Message-ID: <xmqq1u51wqbi.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20130906214138.GA7470@google.com>

Jonathan Nieder <jrnieder@gmail.com> writes:

> 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.

You're right.

It makes me wonder why we did that one inside pull and not in
rebase, though.