From 244001aa20d7a6411d8c920f34799df484d9a787 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 21 Feb 2024 17:38:17 +0000 Subject: [PATCH] rebase: make warning less passive aggressive When you run `git rebase --continue` when no rebase is in progress, git outputs `fatal: No rebase in progress?` which is not a question but a statement. Make it appear as a statement, and use lowercase to align with error message style. Signed-off-by: Harmen Stoppels Signed-off-by: Junio C Hamano --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 6635f10d5294d1..7acb7f3559c764 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1235,7 +1235,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 "