Restore prefer-rebase to its previous behavior--still working on tests.