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

Re: History messup

From
TGThomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date
May 9, 2005, 17:06 UTC
Message-ID
<20050509170611.GJ24216@cip.informatik.uni-erlangen.de>
In-Reply-To
<1115657971.19236.33.camel@tglx>

Hello, if merging with a repository just means to bring the head forward (e.g. no local development since the fork) there is no seperate commit object, just an update of the HEAD. Linus did explain this behaviour and the thoughts behind this decission on the ML:

If two repositories pull alternating from each other one has never the exact state the other has. They would play ping-pong and this is a bad thing. That was AFAIK the reason there is no COMMIT object introduced on 'head forward' merges.

	Thomas
Previous: Thomas GleixnerNext: Thomas Gleixner
Message 2 of 11 in “History messup”
  1. Thomas GleixnerMay 9, 2005
  2. Thomas GlanzmannMay 9, 2005
  3. Thomas GleixnerMay 9, 2005
  4. David WoodhouseMay 9, 2005
  5. Thomas GleixnerMay 9, 2005
  6. H. Peter AnvinMay 9, 2005
  7. David WoodhouseMay 9, 2005
  8. H. Peter AnvinMay 9, 2005
  9. SeanMay 9, 2005
  10. Thomas GleixnerMay 11, 2005
  11. Petr BaudisMay 11, 2005

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.