Maybe it's just me, but using short lived topic/feature branches and squash merges seems much easier than remembering all of these steps to "fix up" all these things.

I think it becomes some what of a game to use all the more obscure corners of git when a good 20-30% of it goes a long way.

Using less commands is more.