Re: Pull is Mostly Evil

From: Jeff King <peff@peff.net>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	Marc Branchaud <marcnarc@xiplink.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: Pull is Mostly Evil
Date: Fri, 2 May 2014 18:36:13 -0400	[thread overview]
Message-ID: <20140502223612.GA11374@sigill.intra.peff.net> (raw)
In-Reply-To: <536414352fa24_1976139f2f0f9@nysa.notmuch>

On Fri, May 02, 2014 at 04:55:01PM -0500, Felipe Contreras wrote:

> They can do:
> 
> % git pull origin master
> 
> That shouldn't revese the bases.

Then they have to remember to do that every time, no? That seems a
little error-prone versus setting a config option.

> > Such users are going to run "git pull origin master" or just "git pull"
> > to get that merge.
> 
> I'd say the vast majority of users running "git pull" want the parents
> reversed, the minority that doesn't can switch to "git pull origin
> master" (or add a configuration).

I'm not sure I agree, but I don't think either of us has actual data.

> Most likely the consensus and the proposals will be ignored and nothing
> will change as usual, but that's a different thing.

Is it truly necessary to make sniping comments like this at the end of
each email? It _is_ being discussed right now, and these comments do
nothing except irritate your readers. Please stop.

-Peff