For what it's worth, git add, git checkout, and git reset all take the -p (or --patch) option, which allows selection of sub-sections of files to stage, discard, or unstage, respectively.