Re: Pull is Mostly Evil

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 2, 2014, 23:27 UTC
Message-ID: <536429e97cf5a_200c12912f094@nysa.notmuch>
In-Reply-To: <20140502223612.GA11374@sigill.intra.peff.net>

Jeff King wrote:

Show 10 quoted lines

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

Yes. However, since not many people do this, and they don't do it that often that's not a big deal.

It's much more important to fix the issue the vast majority of users face constantly.

Show 8 quoted lines

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

Do you want me to go dig in the mailing list and point you to the endless discussions?

I assure you, if this is not changed, we will have this discussion again.

Show 6 quoted lines

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

And it has been discussed before. If history is any indication, it will be discussed again.

-- 
Felipe Contreras