From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Sun, 11 Sep 2005 11:48:10 GMT
Subject: Re: bogus merges
Message-ID: <46a038f905091104483cc01a11@mail.gmail.com>
In-Reply-To: <20050911112130.A7510@flint.arm.linux.org.uk>

On 9/11/05, Russell King <rmk@arm.linux.org.uk> wrote:
> On Mon, Sep 05, 2005 at 09:01:32AM -0700, Linus Torvalds wrote:
> > I suspect rmk is using cogito-0.13
> 
> Correct, and rmk will probably be extremely nervous about upgrading when
> 0.14 appears.

Well, *actually* cogito-0.13 didn't include git-core, so we have to
look for the reasons elsewhere. Could be the leftover MERGE_HEAD
Daniel mentions.

Russel, can you confirm what git-core version you are/were running?

cheers,.


martin