From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 20 Jun 2005 02:28:16 GMT
Subject: Re: 'git commit' duplicates parents?
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