Forgot to mention stacked-git (stg). This is a tool to deal with patch stacks - much like the age old quilt tool often used by kernel hackers. Unlike quilt, stg uses git to manage a stack of patches. This tool was originally written in Python. It was recently rewritten in Rust by the same team.

Having used stg, it’s like having multiple staging indexes in git. This allows you to craft a good commit history like the one you get from using interactive rebasing. Unlike interactive rebasing, you don’t have to wait till finishing the feature, in order to achieve that result. If you are a git user and haven’t given stg a try yet, I strongly recommend you do. It’s a nice tool to have in your development tool chest.