On Sat, Aug 03, 2013 at 09:57:28AM -0700, Jonathan Nieder wrote: > > All is not lost. Your local files should be stored in the repository's > > reflog. Examine the output of "git reflog". You can then reset your > > working directory to obtain those files by doing something _like_ > > "git reset --hard HEAD@{1}". > > Adam hadn't made a commit, so that wouldn't work in this case. > > "git fsck --lost-found" should be helpful, but yeah, this is a bug. > See for example [1] for the start of a patch to play with (needs > tests). If I understand the situation correctly, this is actually already fixed in v1.8.3.3 and higher by b4dc085 (pull: merge into unborn by fast-forwarding from empty tree, 2013-06-20). -Peff -- To unsubscribe from this list: 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