🔀 Fix Rebase Autosquash Reordering Unrelated Commits
`git rebase -i –autosquash` looks for commits whose message starts with `squash!` or `fixup!` followed by text matching an earlier commit’s subject line, and automatically moves that commit to sit right after the one it targets in the generated todo list. Its matching is a simple text match against commit SUBJECTS, not a link to a specific commit hash — so if two earlier commits in the range share a similar enough subject (common when working across several small WIP commits with generic messages), autosquash can silently attach a fixup to the WRONG one, reordering it next to a commit it was never meant to be folded into.
🔎 The Problem
Range being rebased: abc111 update tests def222 add validation ghi333 update tests <- a second, unrelated commit, same subject jkl444 fixup! update tests <- matches by text, could attach to EITHER one Autosquash resolves it against whichever matching subject it encounters first while building the todo list, not necessarily the one you meant when you wrote `git commit --fixup`.
✅ Fix: Target Commits by Hash, Not by Text
- Use `git commit –fixup=<commit-hash>` instead of typing `fixup! <subject>` by hand — the hash-based form writes the full, disambiguated subject automatically so there’s no manual copy-paste to get subtly wrong.
- Before letting autosquash run, invoke `git rebase -i –autosquash <base>` and actually read the generated todo list rather than assuming it resolved correctly — autosquash only reorders the todo list, it doesn’t rewrite history until you save and close that editor.
- If a batch of WIP commits share near-identical subject lines, give each one a distinguishing detail (a filename, a ticket number) before writing a `fixup!` commit against one of them, rather than relying on exact text matching to disambiguate later.
🚨 Why This Is Dangerous
- A fixup silently folded onto the wrong commit doesn’t error — it just produces a final history where one commit contains a change it was never meant to, and that mis-grouping can survive all the way to a bisect or a revert months later.
Autosquash matches what a commit’s subject says, not what you meant when you wrote the fixup.
