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

Re: 'git commit' duplicates parents?

From
JGJeff Garzik <jgarzik@pobox.com>
Date
Jun 20, 2005, 02:28 UTC
Message-ID
<42B629C0.6030008@pobox.com>
In-Reply-To
<Pine.LNX.4.58.0506191921270.2268@ppc970.osdl.org>
Linus Torvalds wrote:
> As to why you had a .git/MERGE_HEAD in your tree, it's probably because 
> your merge scripts haven't kept up with mine.

Nope, I use vanilla latest ones. FWIW my setup is 100% vanilla git plus two small scripts, 'git-switch-tree' and 'git-new-branch', which switch around .git/HEAD.

Doing some experimenting, it seems that git-pull-script does not remove MERGE_HEAD and ORIG_HEAD after its done.

This is reproducible by updating vanilla linux-2.6.git using vanilla git-pull-script. Just a standard update-to-latest-kernel, with no conflicts/merges/etc.

	Jeff
Previous: Linus TorvaldsNext: Linus Torvalds
Message 4 of 12 in “'git commit' duplicates parents?”
  1. Jeff GarzikJun 19, 2005
  2. Jeff GarzikJun 19, 2005
  3. Linus TorvaldsJun 20, 2005
  4. Jeff GarzikJun 20, 2005
  5. Linus TorvaldsJun 20, 2005
  6. Jeff GarzikJun 20, 2005
  7. Linus TorvaldsJun 20, 2005
  8. Dan HolmsandJun 20, 2005
  9. Linus TorvaldsJun 20, 2005
  10. Dan HolmsandJun 20, 2005
  11. Linus TorvaldsJun 20, 2005
  12. Dan HolmsandJun 20, 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.