Anton Korobeynikov wrote: > Most probably git pull --rebase will happily clean all the stuff. That's simply a fetch + rebase: the rebase will try to rebase the good commit on top of the bad commit and fail horribly. Use the reset --hard I suggested.