diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-01 14:38:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-01 14:38:56 -0800 |
| commit | 2b5738c867c1fb085a33544640bb9c52372ae2f7 (patch) | |
| tree | 450c11090e173c81e755efdcd6db9a25f0a4cb18 | |
| parent | 8e69efba8f27eebdcbbd47c0267b5cc6a9f564b9 (diff) | |
| parent | 244001aa20d7a6411d8c920f34799df484d9a787 (diff) | |
| download | git-2b5738c867c1fb085a33544640bb9c52372ae2f7.tar.gz | |
Merge branch 'hs/rebase-not-in-progress' into HEAD
Error message update.
* hs/rebase-not-in-progress:
rebase: make warning less passive aggressive
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 5b086f651a..6ead9465a4 100644 --- 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 " |