On: Magit, the magical Git interface (2017)

[password4321]

https://github.com/arxanas/git-branchless is worth a look as well. Currently alpha, and "designed for use in a repository with a single main branch", but offers extended undo and rebase functionality.