From: Daniel Drake <dsd@gentoo.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.
Date: Wed, 12 Jul 2006 23:49:27 +0100 [thread overview]
Message-ID: <44B57C77.1070000@gentoo.org> (raw)
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
prev parent reply other threads:[~2006-07-12 22:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-12 22:35 git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge Daniel Drake
2006-07-12 22:39 ` Linus Torvalds
2006-07-12 22:49 ` Daniel Drake [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44B57C77.1070000@gentoo.org \
--to=dsd@gentoo.org \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).