It seems no matter how careful and disciplined you are with your git workflow, you end up in a situation where you have incomplete work that you need to ...uh.. "stash" somewhere because it isn't ready to be committed. Luckily, git has a feature to handle just that. The blog link below is a great overview of the stash feature in git.
Link: Git: How to use Stash
Permanent Link — Posted in Web Links