Hacker News Reader

At some point the changes are going to get merged in, no? And that that point I would really like the commits to be nice.

git log --first-parent

That's why you squash and make the commit message readable.

Squash all the commits I worked so hard to make atomic?

No, you don't want to squash everything into one commit. You want logical, clean history.