[ToJans76]

for the first one, you don't need rebase afaik:

    git branch name-of-the-correct-branch
   
    git reset --hard HEAD~

    git checkout name-of-the-correct-branch