I use git cherry-pick -p <commit> -- path/to/file

This lets me cherry-pick only the lines I want from a file within a commit. You can then even split s the chunks to get even more granular.