Oh, I do that as well. "reset --hard origin/trunk" for the win, if you know what I mean.

But, will I venture out to stage only a few chunks of local changes into a single commit using the command line interface? Hells to the no.