From: Daniel Drake <dsd@gentoo.org>
Date: Wed, 12 Jul 2006 22:49:27 GMT
Subject: Re: git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.
Message-ID: <44B57C77.1070000@gentoo.org>
In-Reply-To: <Pine.LNX.4.64.0607121538300.5623@g5.osdl.org>

Linus Torvalds wrote:
> 
> On Wed, 12 Jul 2006, Daniel Drake wrote:
>> git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.
>>
>> $ git diff
>> diff --git a/Kbuild b/Kbuild
>> diff --git a/zd_chip.c b/zd_chip.c
>> diff --git a/zd_chip.h b/zd_chip.h
>> ...
> 
> Do "git update-index --refresh", does it go away?

Yep, thanks.

Daniel