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

[PATCH] merge: don't translate literal commands

From
Alex Henrie <alexhenrie24@gmail.com>
Date
May 15, 2021, 20:01 UTC
Message-ID
<20210515200111.19912-1-alexhenrie24@gmail.com>

These strings have not been modified in any translation, nor should they be.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 builtin/merge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index eddb8ae70d..a8a843b1f5 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -56,8 +56,8 @@ struct strategy {
 
 static const char * const builtin_merge_usage[] = {
 	N_("git merge [<options>] [<commit>...]"),
-	N_("git merge --abort"),
-	N_("git merge --continue"),
+	"git merge --abort",
+	"git merge --continue",
 	NULL
 };
 
-- 
2.31.1
Next: Junio C Hamano
Message 1 of 3 in “merge: don't translate literal commands”
  1. merge: don't translate literal commandsAlex Henrie, May 15, 2021
  2. Junio C HamanoMay 16, 2021
  3. Derrick StoleeMay 17, 2021

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.