Interactive rebase without fear

A clean history is a gift to reviewers. Interactive rebase lets you shape a branch into a sequence of commits that each make sense on their own.

Set a safety net

git branch backup/$(git branch --show-current)

Rewrite the branch

git rebase -i --autosquash main

• pick keeps a commit as is.
• reword keeps the change and edits the message.
• fixup folds a commit into the one above it and drops its message.
• Reorder lines to reorder commits.

Commit small fixes with git commit --fixup <ref> as you go, and --autosquash will line them up for you.