If I understand correctly, git stash -u stashes everything in your working directory including untracked files and puts your working directory in the state it was i
git stash -u