Re: [PATCH v2] Teach 'git pull' about --rebase

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 28, 2007, 23:12 UTC
Message-ID: <Pine.LNX.4.64.0711282309030.27959@racer.site>
In-Reply-To: <20071128224717.GG7376@fieldses.org>

Hi,

On Wed, 28 Nov 2007, J. Bruce Fields wrote:

Show 6 quoted lines

> Would it be possible to add this to rebase instead of to pull?
> 
> 	git rebase --url git://x.org/x.git master
> 
> where --url means "interpret <upstream> as a branch from the given
> remote repository.

I was briefly considering it.

But the point is this: I know exactly if I want to rebase my branch onto upstream, or if I want to merge it. There is not much point in mixing the two.

So my rationale was: if we already have an existing framework to integrate remote changes with our current branch, why not just go ahead and use it? That's the reason BTW why I originally wanted a "rebase" merge stragegy. Even if it is not technically a merge.

I really rather have no user-friendly support for fetch+rebase (and utter a friendly, but loud curse everytime I made a "git pull" by mistake) than yet another command.

Ciao, Dscho