Just delete the repo and start from scratch. Maybe on a new computer too

It's already pretty good at rebases by default, but this might help: https://github.com/Sjors/skills/blob/master/rebase/SKILL.md