git cherry pick without creating new commit