[pja]

You can also git-add -i to go through the staging area & stage/unstage individual patches.

[jedbrown]

Or use git citool or an emacs mode like egg or magit (other editors have similar) that let you conveniently stage by hunk or line.