There's also an option to squash at merge time, which is commonly used going from a feature branch to an integration branch.