All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jiang Xin <worldhello.net@gmail.com>
Cc: Elijah Newren <newren@gmail.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] i18n: unmark a message in rebase.c
Date: Wed, 11 Mar 2020 11:39:08 -0700	[thread overview]
Message-ID: <xmqqsgiehh2r.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200311065527.7669-1-worldhello.net@gmail.com> (Jiang Xin's message of "Wed, 11 Mar 2020 14:55:27 +0800")

Jiang Xin <worldhello.net@gmail.com> writes:

> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling
> of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for
> translation, but this message should not be changed.

Thanks.

>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
>  builtin/rebase.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index cb7aeae597..bff53d5d16 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  				 "ignoring them"),
>  			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
>  		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> -		OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
> +		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
>  			       N_("how to handle commits that become empty"),
>  			       PARSE_OPT_NONEG, parse_opt_empty),
>  		{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,

      parent reply	other threads:[~2020-03-11 18:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-11  6:55 [PATCH] i18n: unmark a message in rebase.c Jiang Xin
2020-03-11 16:27 ` Elijah Newren
2020-03-11 18:39 ` Junio C Hamano [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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqsgiehh2r.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=worldhello.net@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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.