git cherry pick merge commits