This fixes the problem shown in the previous commit.
For users who have the rebase.autoSquash git config set to true, any regular rebase will squash fixups in addition to rebasing. Not good -- we'll fix that in the next commit.