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

Re: Useful tracking branches and auto merging

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Oct 4, 2010, 20:46 UTC
Message-ID
<20101004204625.GH6466@burratino>
In-Reply-To
<AANLkTimq0sKUavKiXepDOz+DvrymuRAVUyAyV+FzbCBD@mail.gmail.com>
Felipe Contreras wrote:
Show 6 quoted lines
>  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'.
git merge @{u}
> But, while we are on that, why not automatically merge the tracking
> branches?

Maybe 'git pull --all' could be taught to eventually do this? That would be incompatible with its current behavior of fetching everything and merging some random branch, but I don't think anyone is relying on that.

Previous: Felipe ContrerasNext: Felipe Contreras
Message 2 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.