For those of you, who are not familiar with cherry-picking with git, I'll explain it in a few words.
What is cherry-picking?
There is a little bit of documentation and a lot of discussions on stack-exchange about cherry-picking.
Short version:
You can pick selected commits from another branch and apply