kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Error message update.

* hs/rebase-not-in-progress:
  rebase: make warning less passive aggressive
maint
Junio C Hamano 2024-03-01 14:38:56 -08:00
parent 8e69efba8f 244001aa20
commit 2b5738c867
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

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