When your git commit history gets long in the tooth, and you want to clean up your feature and topic branches before the merge to master, you’ll need the facilities of the Git squash commit feature.

What happens is that after my first (successful) merge, the history for the master will contain a single squashed commit, while the history for my branch will still have all the original commits.