jj, I'm still somehow using it for a hobby project, but I really feel like I've gotten completely used to git's mental model. Well, but the nice thing about jj is that if it comes down to it, you have the option of deleting the .jj folder and going back to git.
Translated from Japanese
commit 84f4ca6