I’ve been doing this (manually) for about 10+ years.

I rarely use branches, my local work area is about 50-100 commits on top of master.

I pick/reorder/edit with “git rebase -i”

I’ll prefix the commit summary with a word that helps me keep straight debug changes from ones that will go toward a MR.