Save changes to stash git stash save --keep-index Discard stash git stash drop Apply stash git stash pop Discard changes One file git checkout path/to/file/to/revert All files git checkout -- .