2025-11-12 · Git

Clean up history with an interactive rebase workflow

Reorder, squash, and split commits so your pull request tells a readable story.

Introduction

A safe workflow covering autosquash, fixing the commit you already pushed with force-with-lease, and three situations where you should not rewrite history at all.

What usually goes wrong

Teams that skip this step tend to share three failure modes:

  • Optimizing a number nobody agreed to move.
  • Copying a setup from a project with different constraints.
  • Deferring the decision until it is expensive to reverse.

How to approach it

  1. State the problem in one sentence, in the words your users would use.
  2. Pick a signal you can measure weekly, not just at launch.
  3. Timebox a small trial; a two-day spike beats a two-week debate.

Wrap-up

If Git taught us anything, it is that boring consistency beats clever one-offs. Bring the lessons back to your team before they fossilize into folklore.