Merge branch 'rj/prune-packed-excess-args'

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 96efd40901dba9424e61775e3033622ceaaba388..7c7bc13e912aa8ba5d2c4dfa781fb74cd20ac6d4 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        }
 
        if (options.reschedule_failed_exec && !is_interactive(&options))
-               die(_("--reschedule-failed-exec requires an interactive rebase"));
+               die(_("%s requires an interactive rebase"), "--reschedule-failed-exec");
 
        if (options.git_am_opts.argc) {
                /* all am options except -q are compatible only with --am */