Hi Dmitry, On Sun, Apr 17, 2011 at 9:38 AM, Dmitry Potapov <dpotapov@xxxxxxxxx> wrote: > The repository is not borked, it's just your working tree is in an > inconsistent state, but it is easy to fix: > > git reset --hard HEAD Ah, sounds like my intuition that simply freeing up space and then re-pulling should have fixed the problem was wrong. Your explanation makes sense. > BTW, did you mean "git pull" above? Because if you did "git push" > then those bogus changes are at the server now. No, I work with a centralized repository which requires push operations. I know this negates the benefit of distributed SCM. > It always helps to run "gitk --all" to see what you are doing. > [...] > So, the general solution is only one: > > Âgit reset --hard HEAD Thank you for your patient responses to what turned out to be a very basic question! My typical git workflow is very simple and has worked fine until I ran out of disk space. Luke -- 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