git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Alexander Shopov <ash@kambanaria.org>
Date
Feb 16, 2024, 10:15 UTC
Message-ID
<20240216101647.28837-2-ash@kambanaria.org>
In-Reply-To
<20240216101647.28837-1-ash@kambanaria.org>
Mark --rebase-merges as option rather than variable name
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
---
 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
Previous: Alexander ShopovNext: Alex Henrie
Message 2 of 9 in “[Improvements on messages 0/5] Disambuiguate between options and commands”
  1. Alexander ShopovFeb 16, 2024
  2. 1/5 rebase: trivial fix of error messageAlexander Shopov, Feb 16, 2024
  3. Alex HenrieFeb 16, 2024
  4. 2/5 transport-helper.c: trivial fix of error messageAlexander Shopov, Feb 16, 2024
  5. 3/5 builtin/remote.c: trivial fix of error messageAlexander Shopov, Feb 16, 2024
  6. 4/5 builtin/clone.c: trivial fix of messageAlexander Shopov, Feb 16, 2024
  7. 5/5 revision.c: trivial fix to messageAlexander Shopov, Feb 16, 2024
  8. Junio C HamanoFeb 16, 2024
  9. Junio C HamanoMar 5, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.