Add -x option to git cherry-pick to include original SHA

Git no longer includes the original SHA as a comment in cherry-pick, you have to add the '-x' option to get it. Should be an option in the cherry-pick confirmation dialog (it was removed as a default from git to avoid mentioning SHAs which were only ever private branches).