Just use:
git stash -k -u
This will stash unstaged changes and untracked files (new files) and keep staged files.
It's better than reset
/checkout
/clean
, because you might want them back later (by git stash pop
). Keeping them in the stash is better than discarding them.