git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Paolo Bonzini <bonzini@gnu.org>
Date
Jun 11, 2008, 05:23 UTC
Message-ID
<484F6162.6060606@gnu.org>
In-Reply-To
<484F33E9.1060205@keyaccess.nl>
Show 7 quoted lines
>>> 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
Previous: Rene HermanNext: Daniel Barkalow
Message 8 of 16 in “"git pull . <branch>" versus "git merge <branch>"”
  1. Rene HermanJun 11, 2008
  2. David SymondsJun 11, 2008
  3. Rene HermanJun 11, 2008
  4. Miklos VajnaJun 11, 2008
  5. Rene HermanJun 11, 2008
  6. Paolo BonziniJun 11, 2008
  7. Rene HermanJun 11, 2008
  8. Paolo BonziniJun 11, 2008
  9. Daniel BarkalowJun 11, 2008
  10. Brandon CaseyJun 11, 2008
  11. Daniel BarkalowJun 11, 2008
  12. Brandon CaseyJun 11, 2008
  13. Mikael MagnussonJun 11, 2008
  14. Rene HermanJun 12, 2008
  15. Junio C HamanoJun 11, 2008
  16. Rene HermanJun 12, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.