git cherry pick pr merge commit