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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 28, 2007, 20:40 UTC
Message-ID: <Pine.LNX.4.64.0711282039430.27959@racer.site>
In-Reply-To: <27E5EF3C-19EF-441C-BB12-0F5B29BEAEDB@midwinter.com>

Hi,

On Wed, 28 Nov 2007, Steven Grimm wrote:

Show 11 quoted lines

> On Nov 28, 2007, at 5:11 AM, Johannes Schindelin wrote:
> > As a convenience, you can set the default behavior for a branch by 
> > defining the config variable branch.<name>.rebase, which is 
> > interpreted as a bool.  This setting can be overridden on the command 
> > line by --rebase and --no-rebase.
> 
> I wonder if this shouldn't be branch.<name>.pulltype or something like 
> that, so we can represent more than just "rebase or not." Values could 
> be "rebase", "merge" (the default) and maybe even "manual" to specify 
> that git-pull should neither merge nor rebase a particular branch even 
> if it matches a wildcard refspec.

I am not convinced that this is a good thing... We already have branch.<name>.mergeOptions for proper merges, and I want to make clear that this is about rebase, and not about merge.

Ciao, Dscho