cherry pick git merge commit