[Cthulhu_]

That's what I do right now, leading to temporary commits like "Squash me" followed by the kinda awkward interactive rebase flow, which is the only instance where I use Vim, and awkwardly and with some resistance at that.

[rlpb]

My method does not lead to any temporary commits.