remove rebase default, default to --no-ff