Skip to content

Commit 244001a

Browse files
haampiegitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0d1bd1d commit 244001a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
12351235
die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
12361236

12371237
if (options.action != ACTION_NONE && !in_progress)
1238-
die(_("No rebase in progress?"));
1238+
die(_("no rebase in progress"));
12391239

12401240
if (options.action == ACTION_EDIT_TODO && !is_merge(&options))
12411241
die(_("The --edit-todo action can only be used during "

0 commit comments

Comments
 (0)