i18n: fix command template placeholder format
PATCH 1/1 i18n: fix command template placeholder format
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <[email protected]>
---
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(-)
Documentation/git-revert.txt +1 -1
@@ -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
builtin/revert.c +1 -1
@@ -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
Signature · 1 line
gitgitgadget
Quoted 3 lines · Jean-Noël Avila via GitGitGadget
i18n: fix command template placeholder format
This patch applies to the revision 2.39 rc0 during the l10n process.
Thanks, will queue.
Quoted 7 lines · Junio C Hamano
Quoted 3 lines · Jean-Noël Avila via GitGitGadget
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.
<[email protected]>
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.
Signature · 1 line
Todd
Quoted 5 lines · Todd Zullinger
Quoted 1 line
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.
builtin/revert.c line 27
Quoted 7 lines · Jean-Noël Avila via GitGitGadget
static const char * const revert_usage[] = {
builtin/revert.c +1
-1-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!
Signature · 1 line
An old man doll... just what I always wanted! - Clara