Squash your git commits for a clean history

Commit early and commit often. But when you are done with your feature, you can combine the commits into a single commit (or a few if that makes more sense to your history).

This allows you to get rid of minor fix commits from your git history.

http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request

https://help.github.com/articles/interactive-rebase