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

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 28, 2007, 21:55 UTC
Message-ID: <7vhcj63uhw.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <8c5c35580711281310h8764a33pba48e65010abf859@mail.gmail.com>

"Lars Hjemli" <hjemli@gmail.com> writes:

Show 13 quoted lines

> 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 ?

Maybe not make this part of git-pull at all? merge and rebase have totally different impact on the resulting history, so perhaps a separate command that is a shorthand for "git fetch && git rebase" may help unconfuse the users.