Subject: Re: "git pull . <branch>" versus "git merge <branch>"

From: Paolo Bonzini <[email-masked]>
Date: Tue, 10 Jun 2008 22:23:46 -0700

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