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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
