git deshacer última confirmación
$ git reset --soft HEAD~1
deshacer cambios no escalonados git
git checkout -- .
git restablecer un archivo
git checkout HEAD -- my-file.txt
git desechar archivos no configurados
git stash save --keep-index --include-untracked
git abortar cambios
git stash save --keep-index --include-untracked
You don't need to include --include-untracked if you don't want to be thorough about it.
After that, you can drop that stash with a git stash drop command if you like.