If you care about having nice self-contained commits, what is your process for sending rough work-in-progress to colleagues, or to continuous integration?
In both cases you can rewrite your commit stack after-the-fact to add new ones, make fixes etc.