From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 05 Sep 2013 19:18:45 GMT
Subject: Re: [PATCH 0/3] Reject non-ff pulls by default
Message-ID: <xmqqd2onhyay.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20130905080606.GE2582@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

> On Wed, Sep 04, 2013 at 03:59:18PM -0700, Junio C Hamano wrote:
>> Are there cases where you do not want to either rebase nor merge?
>> If so what do you want to do after "git pull" fetches from the other
>> side?  Nothing?
>
> One other thing that I can see being useful occasionally is:
>
>     git rebase @{u}@{1} --onto @{u}
>
> which allows local commits to be replayed onto a rewritten upstream
> branch.

Sure, that would make sense.

I somehow thought that rebase by default looked in the reflog to do
exactly that. Perhaps I am not remembering correctly.