Sounds like you need to use the reflog more often. git reflog keeps track of all changed references (branch tips, etc) being changed in your repository. You can effectively check back out into any state you want, whenever you want.