Re: [PATCH] Make rebase smarter

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 26, 2007, 23:29 UTC
Message-ID: <7vtzodv4j5.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <Pine.LNX.4.64.0710270013030.4362@racer.site>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 13 quoted lines

> On Fri, 26 Oct 2007, Junio C Hamano wrote:
>
>> Steven Walter <stevenrwalter@gmail.com> writes:
>> 
>> > It is a common workflow to run "git fetch; git rebase origin/<foo>" 
>> > Where foo is the remote tracking branch.  git-rebase should default to 
>> > using the remote tracking branch if no other ref is given.
>> 
>> This would be a reasonable choice between refusing outright and
>> picking one possible action.
>
> Another sensible choice would be "git rebase FETCH_HEAD", at least just 
> after a "git fetch <nick> <branch>"...

We can get the best of both worlds by noticing a line in FETCH_HEAD without not-for-merge marker and use that as the 'onto' commit for the rebase.