rebase: fix incompatible options error message

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 85f980bdce277246a6b55f1e1d4be1c14557cf99..78e982298f1c6e0a367850d965f33acdd1b2c1ac 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1223,14 +1223,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                                break;
 
                if (is_interactive(&options) && i >= 0)
-                       die(_("cannot combine interactive options "
-                             "(--interactive, --exec, --rebase-merges, "
-                             "--preserve-merges, --keep-empty, --root + "
-                             "--onto) with am options (%s)"), buf.buf);
+                       die(_("cannot combine am options "
+                             "with interactive options"));
                if (options.type == REBASE_MERGE && i >= 0)
-                       die(_("cannot combine merge options (--merge, "
-                             "--strategy, --strategy-option) with am options "
-                             "(%s)"), buf.buf);
+                       die(_("cannot combine am options with merge options "));
        }
 
        if (options.signoff) {