rebase --rebase-merges: avoid "empty merges"