From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 28 Aug 2013 23:22:42 GMT
Subject: Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull
Message-ID: <CAMP44s0ggDXfQ0GeCOyRHb25TgUkUGT_OSt3K6u5Ua+EatqD=g@mail.gmail.com>
In-Reply-To: <7vvc4xluxt.fsf@alter.siamese.dyndns.org>

On Fri, Jun 28, 2013 at 5:41 PM, Junio C Hamano <gitster@pobox.com> wrote:
> John Keeping <john@keeping.me.uk> writes:

>> I don't think "git pull remote branch" falls into the same category as
>> plain "git pull" so I'm not convinced that defaulting to merge there is
>> unreasonable.  The original message about this [1] did talk about only
>> "git pull" with no arguments.
>
> If you want to limit the scope to only "git pull" (without any
> command line argument), I actually do not have strong preference for
> or against it either way.  Perhaps a follow-up patch to be squashed?

I do. Whether the user does 'git pull' or 'git pull origin' doesn't
matter, we still want to reject non-fast-forward merges.

-- 
Felipe Contreras