From: Russell King <rmk@arm.linux.org.uk>
Date: Sun, 11 Sep 2005 10:21:30 GMT
Subject: Re: bogus merges
Message-ID: <20050911112130.A7510@flint.arm.linux.org.uk>
In-Reply-To: <Pine.LNX.4.58.0509050853080.3568@evo.osdl.org>

On Mon, Sep 05, 2005 at 09:01:32AM -0700, Linus Torvalds wrote:
> On Mon, 5 Sep 2005, Wayne Scott wrote:
> > A recent commit in linux-2.6 looks like this:
> 
> It hopefully shouldn't happen any more with the improved and fixed
> git-merge-base.
> 
> > Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
> > Date:   Wed Aug 31 10:12:14 2005 +0100
> 
> I suspect rmk is using cogito-0.13

Correct, and rmk will probably be extremely nervous about upgrading when
0.14 appears.

-- 
Russell King