I sometimes prefer using the git-wip commands.

https://github.com/tjmehta/git-wip

Let's me organize my "stashes" based on work-in-progress local branch commits. Also easier to rebase onto if it's a local branch that hasn't been pushed yet etc.

  git wip 
    - alias for git add .; git commit -m __wip;

  git unwip 
    - checks if last commit is a __wip and git reset HEAD^