[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.