Re: [PATCH] Adding rebase merge strategy

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 3, 2007, 15:54 UTC
Message-ID: <Pine.LNX.4.64.0710031653480.28395@racer.site>
In-Reply-To: <550f9510710030711p195378c5t2739292d31a12de@mail.gmail.com>

Hi,

On Wed, 3 Oct 2007, Tom Clarke wrote:

Show 10 quoted lines

> On 10/2/07, Junio C Hamano <gitster@pobox.com> wrote:
> > I do not offhand think of a place other than "git pull" that
> > would make sense to sometimes be able to rebase when you
> > normally use merge, so I am inclined to say it would be easier
> > to teach that "'git pull' is usually a 'git fetch' followed by
> > 'git merge', but in certain workflow it is handier to 'git
> > fetch' and then 'git rebase', and here are the ways to get the
> > rebasing behaviour...".
> 
> I agree. I'll revisit teaching pull to be able to use rebase.

In that case, may I request a config variable to set this behaviour automatically when calling "git pull <nick>"?

Had we stayed with the merge strategy approach, that would have come for free with the --no-ff patch series.

Ciao, Dscho