git cherry pick multiple merge commits