{"thread":{"id":"58857","subject":"[PATCH] i18n: fix command template placeholder format","startedAt":"2022-11-26T17:24:09Z","lastAt":"2022-11-28T13:41:10Z","messageCount":5,"participants":["Jean-Noël Avila via GitGitGadget","Junio C Hamano","Todd Zullinger","Bagas Sanjaya"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"468017","messageId":"pull.1435.git.1669483442230.gitgitgadget@gmail.com","threadId":"58857","inReplyTo":null,"subject":"[PATCH] i18n: fix command template placeholder format","fromName":"Jean-Noël Avila via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-11-26T17:24:02Z","receivedAt":"2022-11-26T17:24:09Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>\n\nSigned-off-by: Jean-Noël Avila <jn.avila@free.fr>\n---\n    i18n: fix command template placeholder format\n    \n    This patch applies to the revision 2.39 rc0 during the l10n process.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1435%2Fjnavila%2Ffix_i18n_v2.39-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1435/jnavila/fix_i18n_v2.39-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1435\n\n Documentation/git-revert.txt | 2 +-\n builtin/revert.c             | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\nindex 5016755efb6..d2e10d3dceb 100644\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -8,7 +8,7 @@ git-revert - Revert some existing commits\n SYNOPSIS\n --------\n [verse]\n-'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n+'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\n 'git revert' (--continue | --skip | --abort | --quit)\n \n DESCRIPTION\ndiff --git a/builtin/revert.c b/builtin/revert.c\nindex ee32c714a76..6a9b550a61f 100644\n--- a/builtin/revert.c\n+++ b/builtin/revert.c\n@@ -21,7 +21,7 @@\n  */\n \n static const char * const revert_usage[] = {\n-\tN_(\"git revert [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\"),\n+\tN_(\"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\"),\n \tN_(\"git revert (--continue | --skip | --abort | --quit)\"),\n \tNULL\n };\n\nbase-commit: c000d916380bb59db69c78546928eadd076b9c7d\n-- \ngitgitgadget\n"},{"id":"468033","messageId":"xmqqr0xp9of5.fsf@gitster.g","threadId":"58857","inReplyTo":"pull.1435.git.1669483442230.gitgitgadget@gmail.com","subject":"Re: [PATCH] i18n: fix command template placeholder format","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-11-27T01:27:58Z","receivedAt":"2022-11-27T01:28:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jean-Noël Avila via GitGitGadget\"  <gitgitgadget@gmail.com> writes:\n\n>     i18n: fix command template placeholder format\n>     \n>     This patch applies to the revision 2.39 rc0 during the l10n process.\n\nThanks, will queue.\n"},{"id":"468034","messageId":"Y4Ln43f6iP1b6EHo@pobox.com","threadId":"58857","inReplyTo":"xmqqr0xp9of5.fsf@gitster.g","subject":"Re: [PATCH] i18n: fix command template placeholder format","fromName":"Todd Zullinger","fromEmail":"tmz@pobox.com","sentAt":"2022-11-27T04:30:27Z","receivedAt":"2022-11-27T04:34:47Z","isPatch":true,"sender":{"key":"tmz@pobox.com","avatar":"https://avatars.githubusercontent.com/u/806319?v=4"},"body":"Junio C Hamano wrote:\n> \"Jean-Noël Avila via GitGitGadget\"  <gitgitgadget@gmail.com> writes:\n> \n>>     i18n: fix command template placeholder format\n>>     \n>>     This patch applies to the revision 2.39 rc0 during the l10n process.\n> \n> Thanks, will queue.\n\nIn case its helpful, an identical patch was sent on\nWednesday, Subject: [PATCH] revert: add angle bracket around\nargument 'parent-number' in usage.\n\n    <pull.1386.git.git.1669241489179.gitgitgadget@gmail.com>\n\nIts commit message notes:\n\n    8c9e292dc0 (doc txt & -h consistency: add missing\n    options and labels, 2022-10-13) adds detailed usage line\n    for revert and cherry-pick, which both contain a flag\n    `-m` for parent number.\n\n    Angle brackets shall be marked around parent-number,\n    since it represents\n    an argument.\n\n-- \nTodd\n"},{"id":"468064","messageId":"abd9d2ce-a68b-905e-4ec2-4964aef6ee6c@gmail.com","threadId":"58857","inReplyTo":"pull.1435.git.1669483442230.gitgitgadget@gmail.com","subject":"Re: [PATCH] i18n: fix command template placeholder format","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2022-11-28T08:37:39Z","receivedAt":"2022-11-28T08:37:48Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 11/27/22 00:24, Jean-Noël Avila via GitGitGadget wrote:\n >  static const char * const revert_usage[] = {\n> -\tN_(\"git revert [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\"),\n> +\tN_(\"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\"),\n>  \tN_(\"git revert (--continue | --skip | --abort | --quit)\"),\n>  \tNULL\n>  };\n> \n\nLooks OK, thanks!\n\nReviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>\n\n-- \nAn old man doll... just what I always wanted! - Clara\n\n"},{"id":"468093","messageId":"xmqqpmd75h8v.fsf@gitster.g","threadId":"58857","inReplyTo":"Y4Ln43f6iP1b6EHo@pobox.com","subject":"Re: [PATCH] i18n: fix command template placeholder format","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-11-28T13:41:04Z","receivedAt":"2022-11-28T13:41:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Todd Zullinger <tmz@pobox.com> writes:\n\n>> Thanks, will queue.\n>\n> In case its helpful, an identical patch was sent on\n> Wednesday, Subject: [PATCH] revert: add angle bracket around\n> argument 'parent-number' in usage.\n\nYup, more eyes finding the same issue is very good and is very much\nappreciated.  And in a case like this trivial one, it is not\nsurprising that there is only a single way to make it correct.\n\nThanks, all, again for your contributions.\n\n"}]}