From: Derrick Stolee <stolee@gmail.com>
To: Alex Henrie <alexhenrie24@gmail.com>,
git@vger.kernel.org, pclouds@gmail.com, judge.packham@gmail.com,
gitster@pobox.com
Subject: Re: [PATCH] merge: don't translate literal commands
Date: Mon, 17 May 2021 12:49:56 -0400 [thread overview]
Message-ID: <77314c35-281c-38af-c993-32a0c092b1cc@gmail.com> (raw)
In-Reply-To: <20210515200111.19912-1-alexhenrie24@gmail.com>
On 5/15/2021 4:01 PM, Alex Henrie wrote:
> 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",
I just commented on your other patch wondering if there
were other examples that needed update. I think these
would be better suited to be grouped as a patch series
that describes the effort to remove unnecessary translation
as a unified whole.
Thanks,
-Stolee
prev parent reply other threads:[~2021-05-17 16:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 20:01 [PATCH] merge: don't translate literal commands Alex Henrie
2021-05-16 4:00 ` Junio C Hamano
2021-05-17 16:49 ` Derrick Stolee [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=77314c35-281c-38af-c993-32a0c092b1cc@gmail.com \
--to=stolee@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=judge.packham@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).