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:40 UTC
Message-ID
<42B62C85.10701@pobox.com>
In-Reply-To
<Pine.LNX.4.58.0506191926530.2268@ppc970.osdl.org>
Linus Torvalds wrote:
> Btw, if possibly, you should just undo it. It's "valid" in the sense that
Any crap like this, I undo it manually (cat previous head to .git/HEAD)
> Again, "git commit" _did_ warn about this, I'm sure, but I actually see 
> why that stupid MERGE_HEAD file was there - a null merge won't remove a 
> stale MERGE_HEAD, so it's probably because you did a "git pull" that was a 
> trivial merge, and that would have left that turd around..

Probably PEBCAK... my missing the big "MERGE_HEAD exists" warning caused the problem, it sounds like.

I simply assumed that the vanilla git scripts would clean up after themselves :)

	Jeff
Previous: Linus TorvaldsNext: Linus Torvalds
Message 6 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.