everything is a mess
Then don't touch it.
- Clone again your repo in another local repo: at least, everything will be reset.
- add your first local repo as a remote to the second:
git remote add first ../firstRepo
git fetch first
Then:
- make your
bootstrap
branch in that new local repo:git checkout -b bootstrap
- through a nice log:
git log --oneline --graph -all --branches
, seek your new commits inremotes/first
, and cherry-pick them to your current bootstrap branch.