git stash is handy. I tend to forget about stashed code, though, so I only stash stuff if I know I will pop it soon.