> But even then you might discover new edge cases and have to tack them on as additional commits.

Have you heard about `rebase -i` ?