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

From: Steven Grimm <koreth@midwinter.com>
Date: Nov 28, 2007, 20:35 UTC
Message-ID: <27E5EF3C-19EF-441C-BB12-0F5B29BEAEDB@midwinter.com>
In-Reply-To: <Pine.LNX.4.64.0711281307420.27959@racer.site>

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.

Not too sure about that last suggestion but it seems like there might be other settings than "rebase" and "merge" in the future even if that's not one of them.

-Steve