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

Re: Useful tracking branches and auto merging

From
Clemens Buchacher <drizzd@aon.at>
Date
Oct 10, 2010, 17:15 UTC
Message-ID
<20101010171505.GA15495@localhost>
In-Reply-To
<AANLkTikkXdDepdeOY4MZvgfCEgX69Tx6d0-QS-g3bWK-@mail.gmail.com>
On Mon, Oct 04, 2010 at 11:56:02PM +0300, Felipe Contreras wrote:
>
> Moreover, wouldn't it make sense to make 'git merge' = 'git merge
> @{u}'?

Isn't that what 'git pull' does? Especially after using 'git fetch'?

I prefer 'git merge' as one of the few git commands without magic behavior and DWIMery.

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