Merge branch 'hs/rebase-not-in-progress' into HEAD

Error message update. * hs/rebase-not-in-progress: rebase: make warning less passive aggressive
git · Mar 1, 2024 · 2b5738c · 2b5738c
2 parents 8e69efb + 244001a
commit 2b5738c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin/rebase.c b/builtin/rebase.c
@@ -1254,7 +1254,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 "