Re: [PATCH 04/11] Use "git merge" instead of "git pull ."

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 27, 2013, 19:44 UTC
Message-ID: <20130827194422.GW4110@google.com>
In-Reply-To: <xmqqob8jc5s6.fsf@gitster.dls.corp.google.com>

On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote:

Show 9 quoted lines

> Thomas Ackermann <th.acker@arcor.de> writes:
> 
> > "git pull ." works, but "git merge" is the recommended
> > way for new users to do things. (The old description
> > also should have read "The former is actually *not* very
> > commonly used".)
> 
> It does not matter that you are unaware other people use it often.
> I'd suggest dropping the first hunk altogether.

Eh, the claim "The former is actually very commonly used." is confusing on its own (even though it used to be true) and elaborating wouldn't help much with education, so the first hunk makes sense to me. But maybe it should have been done in a separate patch. ;-)

Thanks, Jonathan