From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 28 Nov 2007 21:10:34 GMT
Subject: Re: [PATCH v2] Teach 'git pull' about --rebase
Message-ID: <8c5c35580711281310h8764a33pba48e65010abf859@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0711282039430.27959@racer.site>

On 11/28/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Wed, 28 Nov 2007, Steven Grimm wrote:
> > 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.

Maybe branch.<name>.pullOptions ?

--
larsh