Comment by u801e

You could run git reset without the --hard parameter to keep unstaged changes in the working directory