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 - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html