George Brocklehurst makes things for the internet.

Auto-squashing Git Commits

Posted on

If you've read thoughtbot's Git protocol guide, you'll know that once a branch has been code reviewed, we encourage the branch's author to use an interactive rebase to squash the branch down into a few commits with great commit messages.

It's fairly common for a feature branch to be squashed down to somewhere between one and three commits before it's merged. If you follow this protocol, or something like it, there are a few Git features that can make your interactive rebases quicker and easier.

Read this post in full on the thoughtbot blog: