Thread (7 messages) 7 messages, 2 authors, 2024-02-16

[Improvements on messages 1/5] rebase: trivial fix of error message

From: Alexander Shopov <hidden>
Date: 2024-02-16 10:16:59
Subsystem: the rest · Maintainer: Linus Torvalds

Mark --rebase-merges as option rather than variable name

Signed-off-by: Alexander Shopov <redacted>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4084a6abb8..9c6d971515 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -746,7 +746,7 @@ static void parse_rebase_merges_value(struct rebase_options *options, const char
 	else if (!strcmp("rebase-cousins", value))
 		options->rebase_cousins = 1;
 	else
-		die(_("Unknown rebase-merges mode: %s"), value);
+		die(_("Unknown --rebase-merges mode: %s"), value);
 }

 static int rebase_config(const char *var, const char *value,
--
2.43.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help