Re: [PATCH] rebase: use @{upstream} if no upstream specified

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Feb 10, 2011, 02:46 UTC
Message-ID: <alpine.DEB.2.00.1102092136580.20937@debian>
In-Reply-To: <7voc6k62xq.fsf@alter.siamese.dyndns.org>

On Wed, 9 Feb 2011, Junio C Hamano wrote:

Show 10 quoted lines

> Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
> 
> > 'git rebase' without arguments is currently not supported. 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.
> 
> Not that I am fundamentally opposed to the proposed change, but the above is
> not a very convincing argument, when the corresponding change to "git merge"
> is just started getting discussed.

There was a little more motivation later in the commit message, like using it with 'git rebase -i'. I have been using it for a few months now, and I also find it quite useful e.g. when rebasing all my branches on top of your master.

> 
> On top of what commit does this patch apply, by the way?

On top of the rebase refactoring series I posted a few days ago. See http://thread.gmane.org/gmane.comp.version-control.git/166161/.

/Martin