Have you come across `git rebase --update-refs`? This automatically moves your "intermediate" branches during a rebase and sounds like it could be useful in your situation.
There's also `git rebase --onto`, which effectively does the reverse - you tell git you've already rebased the part of this branch that overlapped with the "intermediate" branch, and it just needs to take care of the rest.
Oh that sounds exactly what I need to simplify the workflow I described for the multi-PR use case. I'm going to try that out today, I just happen to have a use case for it ready to go :)
This was my bugbear for a long time too, and then I found fzf-git.sh (actually its PowerShell equivalent, PSFzf).
fzf (absolutely incredible tool with many uses) gives you fuzzy searching of anything you care to name, and fzf-git combines this with shell key bindings to let you pop up a fuzzy-searchable list of branches/commits/tags/whatever while typing your fixup command, then paste the object you select into your in-progress command line.
No more counting commits in log output to know how many ^ to put after HEAD, or copying out segments of commit SHAs!
Right, so that cuts both ways. Then review the _product_, rather than using the review as a channel for a whinge about how it didn't land in your hands as soon as you'd have liked. That misses the point of what reviews are too.
Head tracking (without full VR) is quite a big niche in flight/space sims, whether just for rotations or a limited amount of translation as well. It's much more natural using your head to look around, keeps your hands on the flight controls, and frees up hat switches and other buttons which no longer need to serve that purpose.
I run Fraidycat in a separate Firefox profile which I don't use for anything else. If I want to hang onto a link from a feed, I'll just open it again in my main profile. I've found a side benefit in that the slight extra friction of opening a window for a new profile results in less frequent checking for feed updates, which seems like a good thing for me.
I also have my Fraidycat profile set up with the Temporary Containers extension, so that every link I open from my feeds automatically opens into an ephemeral container and nothing is shared. Doesn't protect against Fraidycat itself, but does keep things of only passing interest nicely hived off from everything else.