Merge branch 'js/merge-base-with-missing-commit'

[thirdparty/git.git] / builtin / rebase.c

diff --git a/builtin/rebase.c b/builtin/rebase.c
index a171e53c5e6f328d77017ad2b26af47fd5bd2d3f..be787690bd7c2b6396784a1476314b8f757ab749 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1256,7 +1256,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
 
        if (options.action != ACTION_NONE && !in_progress)
-               die(_("No rebase in progress?"));
+               die(_("no rebase in progress"));
 
        if (options.action == ACTION_EDIT_TODO && !is_merge(&options))
                die(_("The --edit-todo action can only be used during "