Add --rebase-merges to git fixup and squash
Add --rebase-merges to git fixup and squash

Dunno if you ever *don't* want --rebase-merges.
Maybe I should add it to all my rebase aliases.

kbd/setup,kbd/setup,kbd/setup,kbd/setup,kbd/setup