From: Paolo Bonzini <bonzini@gnu.org>
Date: Wed, 11 Jun 2008 05:23:46 GMT
Subject: Re: "git pull . <branch>" versus "git merge <branch>"
Message-ID: <484F6162.6060606@gnu.org>
In-Reply-To: <484F33E9.1060205@keyaccess.nl>


>>> There is no difference, but you really want to use git merge and not git
>>> pull in such a case, I guess the git pull form is supported mainly to
>>> keep backwards compatibility.
>>
>> However, when you're on a tracking merge
> 
> On a what? :)

Tracking *branch*, sorry.  A branch that has configuration options like

	[branch "foo"]
		remote = origin
		merge = next

so that git knows that, when you're on branch foo, "git pull" is 
actually equivalent to "git pull origin next:foo".

Paolo