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

git merge remote branch says "Merge commit ..."?

From
Sskillzero@gmail.com <skillzero@gmail.com>
Date
May 21, 2009, 19:50 UTC
Message-ID
<2729632a0905211250v4e7537caybe9e703c14361b5f@mail.gmail.com>

I noticed that if I do 'git merge origin/branch' that the log message says (using --log):

Merge commit 'origin/branch'
   * commit 'origin/branch':
     Fixed some bug.
If I do the same thing from a local tracking branch of origin/branch, it says:
Merge branch 'branch'
   * branch:
     Fixed some bug.

Is it expected that it say "commit" instead of "branch" when the branch is not a local tracking branch? I sometimes merge from remote branches when I don't need to do anything with that branch locally (e.g. I already did the work on another computer and I'm just merging the result into my test machine before I push to the shared server).

Next: Jeff King
Message 1 of 10 in “git merge remote branch says "Merge commit ..."?”
  1. skillzero@gmail.comMay 21, 2009
  2. Jeff KingMay 22, 2009
  3. Eric RaibleMay 22, 2009
  4. Jeff KingMay 22, 2009
  5. Eric RaibleMay 22, 2009
  6. Jeff KingMay 22, 2009
  7. Johannes SixtMay 22, 2009
  8. Jeff KingMay 23, 2009
  9. Junio C HamanoMay 23, 2009
  10. Jeff KingMay 25, 2009

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.