rebase: Allow merge strategies to be used when rebasing