* [PATCH] i18n: fix command template placeholder format
@ 2022-11-26 17:24 Jean-Noël Avila via GitGitGadget
2022-11-27 1:27 ` Junio C Hamano
2022-11-28 8:37 ` Bagas Sanjaya
0 siblings, 2 replies; 5+ messages in thread
From: Jean-Noël Avila via GitGitGadget @ 2022-11-26 17:24 UTC (permalink / raw)
To: git; +Cc: Jean-Noël Avila, Jean-Noël Avila
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
i18n: fix command template placeholder format
This patch applies to the revision 2.39 rc0 during the l10n process.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1435%2Fjnavila%2Ffix_i18n_v2.39-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1435/jnavila/fix_i18n_v2.39-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1435
Documentation/git-revert.txt | 2 +-
builtin/revert.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 5016755efb6..d2e10d3dceb 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -8,7 +8,7 @@ git-revert - Revert some existing commits
SYNOPSIS
--------
[verse]
-'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...
+'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...
'git revert' (--continue | --skip | --abort | --quit)
DESCRIPTION
diff --git a/builtin/revert.c b/builtin/revert.c
index ee32c714a76..6a9b550a61f 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -21,7 +21,7 @@
*/
static const char * const revert_usage[] = {
- 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)"),
NULL
};
base-commit: c000d916380bb59db69c78546928eadd076b9c7d
--
gitgitgadget
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] i18n: fix command template placeholder format
2022-11-26 17:24 [PATCH] i18n: fix command template placeholder format Jean-Noël Avila via GitGitGadget
@ 2022-11-27 1:27 ` Junio C Hamano
2022-11-27 4:30 ` Todd Zullinger
2022-11-28 8:37 ` Bagas Sanjaya
1 sibling, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2022-11-27 1:27 UTC (permalink / raw)
To: Jean-Noël Avila via GitGitGadget; +Cc: git, Jean-Noël Avila
"Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com> writes:
> i18n: fix command template placeholder format
>
> This patch applies to the revision 2.39 rc0 during the l10n process.
Thanks, will queue.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i18n: fix command template placeholder format
2022-11-27 1:27 ` Junio C Hamano
@ 2022-11-27 4:30 ` Todd Zullinger
2022-11-28 13:41 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Todd Zullinger @ 2022-11-27 4:30 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason,
Fangyi Zhou, Jean-Noël Avila
Junio C Hamano wrote:
> "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> i18n: fix command template placeholder format
>>
>> This patch applies to the revision 2.39 rc0 during the l10n process.
>
> Thanks, will queue.
In case its helpful, an identical patch was sent on
Wednesday, Subject: [PATCH] revert: add angle bracket around
argument 'parent-number' in usage.
<pull.1386.git.git.1669241489179.gitgitgadget@gmail.com>
Its commit message notes:
8c9e292dc0 (doc txt & -h consistency: add missing
options and labels, 2022-10-13) adds detailed usage line
for revert and cherry-pick, which both contain a flag
`-m` for parent number.
Angle brackets shall be marked around parent-number,
since it represents
an argument.
--
Todd
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i18n: fix command template placeholder format
2022-11-26 17:24 [PATCH] i18n: fix command template placeholder format Jean-Noël Avila via GitGitGadget
2022-11-27 1:27 ` Junio C Hamano
@ 2022-11-28 8:37 ` Bagas Sanjaya
1 sibling, 0 replies; 5+ messages in thread
From: Bagas Sanjaya @ 2022-11-28 8:37 UTC (permalink / raw)
To: Jean-Noël Avila via GitGitGadget, git; +Cc: Jean-Noël Avila
On 11/27/22 00:24, Jean-Noël Avila via GitGitGadget wrote:
> static const char * const revert_usage[] = {
> - 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)"),
> NULL
> };
>
Looks OK, thanks!
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i18n: fix command template placeholder format
2022-11-27 4:30 ` Todd Zullinger
@ 2022-11-28 13:41 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2022-11-28 13:41 UTC (permalink / raw)
To: Todd Zullinger
Cc: git, Ævar Arnfjörð Bjarmason, Fangyi Zhou,
Jean-Noël Avila
Todd Zullinger <tmz@pobox.com> writes:
>> Thanks, will queue.
>
> In case its helpful, an identical patch was sent on
> Wednesday, Subject: [PATCH] revert: add angle bracket around
> argument 'parent-number' in usage.
Yup, more eyes finding the same issue is very good and is very much
appreciated. And in a case like this trivial one, it is not
surprising that there is only a single way to make it correct.
Thanks, all, again for your contributions.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-28 13:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-26 17:24 [PATCH] i18n: fix command template placeholder format Jean-Noël Avila via GitGitGadget
2022-11-27 1:27 ` Junio C Hamano
2022-11-27 4:30 ` Todd Zullinger
2022-11-28 13:41 ` Junio C Hamano
2022-11-28 8:37 ` Bagas Sanjaya
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).