1
0
mirror of https://github.com/git/git synced 2024-07-05 00:58:49 +00:00

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>
This commit is contained in:
Harmen Stoppels 2024-02-21 17:38:17 +00:00 committed by Junio C Hamano
parent 0d1bd1dfb3
commit 244001aa20

View File

@ -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 "