Undo a git amend
git reset --soft HEAD@{1}
Cherry pick commit from another branch
# this is where I want the commit: git checkout -b feature-b # cherry pick the commit: git cherry-pick 383b7be