git сброс сохраняет изменения
git reset HEAD^ --soft
Itchy Impala
git reset HEAD^ --softgit reflog is your friend.
Find the commit that you want to be on in that list and you can reset to it
for example:git reset --hard e870e41
(If you didn't commit your changes... you might be in trouble - commit early, and commit often!)