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