It's an organizational and personal thing, but you really have to get in the habit of treating commits as single diffs to the codebase and not the equivalent of ctrl + s in your editor.

I try and make a habit of squashing my commits so that git log is a narrative of development and each commit is a page number, not a sticky note.