Who is not tired of committing a "Remove pdb" or a "Fix a typo" few minutes or hours after committing a clean feature ? 

Keep your branch clean with fixup and autosquash.

https://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html