On Tue, Feb 21, 2006 at 12:03:04PM -0800, Linus Torvalds wrote: > That, in turn, is usually due to an aborted merge. Hmm. (Recalls a power outage a few days ago). I'll bet that's when it happened. > Do a "git checkout -f". Fixed, thanks. Dave - : 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