git cherry pick without merge commits