git cherry pick without auto merge