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

Useful tracking branches and auto merging

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 4, 2010, 20:44 UTC
Message-ID
<AANLkTimq0sKUavKiXepDOz+DvrymuRAVUyAyV+FzbCBD@mail.gmail.com>
Hi,

For some time now I've stopped using 'git pull', and used 'git fetch', and now 'git remote update', however, this is still not ideal.

 Your branch is behind 'origin/master' by 17 commits, and can be fast-forwarded.

This message doesn't tell me _how_ I can 'fast-forward', I do 'git merge origin/master' but if git already knows 'master' is tracking 'origin/master' why should I specify that? Perhaps 'git merge --tracking'.

But, while we are on that, why not automatically merge the tracking branches? Perhaps 'git remote update --auto-merge', configurable so I can make auto-merge the default, and perhaps make it the default in 1.8. Also, maybe some people would like them to be auto merged only when they can be fast-forwarded.

I believe this would make remote tracking branches much more useful. What do you think?

Cheers
-- 
Felipe Contreras
Next: Jonathan Nieder
Message 1 of 13 in “Useful tracking branches and auto merging”
  1. Felipe ContrerasOct 4, 2010
  2. Jonathan NiederOct 4, 2010
  3. Felipe ContrerasOct 4, 2010
  4. Jonathan NiederOct 4, 2010
  5. Felipe ContrerasOct 4, 2010
  6. Clemens BuchacherOct 10, 2010
  7. Felipe ContrerasOct 10, 2010
  8. Clemens BuchacherOct 10, 2010
  9. Felipe ContrerasOct 10, 2010
  10. Junio C HamanoOct 5, 2010
  11. Felipe ContrerasOct 5, 2010
  12. Junio C HamanoOct 5, 2010
  13. Felipe ContrerasOct 7, 2010

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.