@skc I'll most likely do a soft reset and then do a new commit with all the changes in it.
The reason why I do it like that, is that it allows me to review and double-check my changes while staging and to describe all the changes in the commit message while viewing them.
Squash does not give me access to the changed code for a final check.