git_cherry_pick -> git_cherrypick
Merge pull request #2485 from ethomson/cherrypick

Rename git_cherry_pick to git_cherrypick