git: Preserving merge commits while rebasing with --rebase-merges ...