aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-02-21 17:38:17 +0000
committerJunio C Hamano <gitster@pobox.com>2024-02-21 09:52:34 -0800
commit244001aa20d7a6411d8c920f34799df484d9a787 (patch)
treee376ca05bf711a4e0e0c846af41e02dfec19bc08
parent0d1bd1dfb37ef25e1911777c94129fc769ffec38 (diff)
downloadgit-244001aa20d7a6411d8c920f34799df484d9a787.tar.gz
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 <me@harmenstoppels.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 6635f10d52..7acb7f3559 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 "