rebase-helper --make-script: introduce a flag to rebase merges