[aninhumer]

And `git checkout -p` to erase hunks from the working directory. (i.e. delete without saving!)

[icebraining]

That's a little dangerous! I use git stash -p instead, and only drop it after I'm absolutely sure.