How to merge a specific commit in git - Stack Overflow VonC git cherry-pick should be your answer here.
