Git: Apply part of a commit to another branch

Question

How can I apply part of a commit from one branch to another? I understand that I can cherry-pick a commit, but I need to go one step further and "cherry pick" some of the changes introduced by that commit and apply them to another (target) branch.

Is there a clean way to do this, or should I just apply the entire commit, manually undo some hunks, and remember to create more atomic commits in the future?

Answer 1

git cherry-pick -n <SHA> will stage the changes but not commit them. You can then use git reset -p to unstage the bits you don't want, or git reset HEAD and git add -Ap to stage only the changes you want.