How to cherry pick from 1 branch to another
When you cherry-pick, it creates a new commit with a new SHA. If you do:
git cherry-pick -x <sha>then at least you'll get the commit message from the original commit appended to your new commit, along with the original SHA, which is very useful for tracking cherry-picks.