git cherry pick merge commit command