Git Squash-Rebase

Mental model

After a parent branch is squash-merged, main contains a new squash commit, not the parent's original commits. A child branch still based on those original commits must be moved with:

git rebase --onto <new-base> <old-parent-tip> <child-branch>

Read it as: move <child-branch> onto <new-base>, bringing only commits after <old-parent-tip>.

Workflow

1. Establish the boundary