[ptgloden]

There's also 'git reset -p' to interactively unstage changes

[panic]

And git checkout -p to interactively bring over parts of another commit (or interactively revert uncommitted changes, if you're checking out HEAD).