All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: pclouds@gmail.com, artagnon@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH] standardize usage strings that were missed the first time
Date: Thu, 02 Apr 2015 14:56:59 -0700	[thread overview]
Message-ID: <xmqqego2i47o.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1428010016-12968-1-git-send-email-alexhenrie24@gmail.com> (Alex Henrie's message of "Thu, 2 Apr 2015 15:26:56 -0600")

Alex Henrie <alexhenrie24@gmail.com> writes:

> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---

Thanks, but please no more _("string") changes for the rest of the
cycle, as that would impact i18n folks who will be starting from
tagged -rc releases.

Please hold them off, and resend them after 2.4.0 final.

Thanks.

>  builtin/blame.c | 2 +-
>  builtin/log.c   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 06484c2..0b2f4ed 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -27,7 +27,7 @@
>  #include "line-range.h"
>  #include "line-log.h"
>  
> -static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] file");
> +static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
>  
>  static const char *blame_opt_usage[] = {
>  	blame_usage,
> diff --git a/builtin/log.c b/builtin/log.c
> index dd8f3fc..4c4e6be 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = "PATCH";
>  static const char *fmt_pretty;
>  
>  static const char * const builtin_log_usage[] = {
> -	N_("git log [<options>] [<revision range>] [[--] <path>...]"),
> +	N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
>  	N_("git show [<options>] <object>..."),
>  	NULL
>  };

  reply	other threads:[~2015-04-02 21:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-02 21:26 [PATCH] standardize usage strings that were missed the first time Alex Henrie
2015-04-02 21:56 ` Junio C Hamano [this message]
2015-04-03 22:47   ` Alex Henrie
2015-04-03 23:48     ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2015-05-02  3:12 Alex Henrie
2015-05-03 17:18 ` Junio C Hamano
2015-05-03 23:59   ` Junio C Hamano
2015-05-04 17:49     ` Alex Henrie
2015-05-04 19:23       ` Junio C Hamano

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=xmqqego2i47o.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=alexhenrie24@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --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.
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.