One of the 100 questions in this topic
git cherry-pick lets you take changes from a commit on one branch and apply them to another.