diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 74a60e8c83..625f50c637 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1811,15 +1811,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "'--reschedule-failed-exec'")); } - if (options.rebase_merges) { - if (strategy_options.nr) - die(_("cannot combine '--rebase-merges' with " - "'--strategy-option'")); - if (options.strategy) - die(_("cannot combine '--rebase-merges' with " - "'--strategy'")); - } - if (!options.root) { if (argc < 1) { struct branch *branch; |