The secret is:
git cherry-pick <commit name>
To find the commit name, you can "git log <branch-that-has-the-commit>"
To see the contents of the commit, you can "git show <commit name>"
Be in the branch you want to change (git checkout <branch>) and then use cherry-pick to bring in exactly the fixes you want.