git cherry pick command for merge commit