{"thread":{"id":"38987","subject":"[PATCH] standardize usage strings that were missed the first time","startedAt":"2015-04-02T21:26:56Z","lastAt":"2015-04-03T23:48:10Z","messageCount":4,"participants":["Alex Henrie","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"258897","messageId":"1428010016-12968-1-git-send-email-alexhenrie24@gmail.com","threadId":"38987","inReplyTo":null,"subject":"[PATCH] standardize usage strings that were missed the first time","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2015-04-02T21:26:56Z","receivedAt":"2015-04-02T21:26:56Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n builtin/blame.c | 2 +-\n builtin/log.c   | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 06484c2..0b2f4ed 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -27,7 +27,7 @@\n #include \"line-range.h\"\n #include \"line-log.h\"\n \n-static char blame_usage[] = N_(\"git blame [<options>] [<rev-opts>] [<rev>] [--] file\");\n+static char blame_usage[] = N_(\"git blame [<options>] [<rev-opts>] [<rev>] [--] <file>\");\n \n static const char *blame_opt_usage[] = {\n \tblame_usage,\ndiff --git a/builtin/log.c b/builtin/log.c\nindex dd8f3fc..4c4e6be 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = \"PATCH\";\n static const char *fmt_pretty;\n \n static const char * const builtin_log_usage[] = {\n-\tN_(\"git log [<options>] [<revision range>] [[--] <path>...]\"),\n+\tN_(\"git log [<options>] [<revision-range>] [[--] <path>...]\"),\n \tN_(\"git show [<options>] <object>...\"),\n \tNULL\n };\n-- \n2.3.5\n"},{"id":"258900","messageId":"xmqqego2i47o.fsf@gitster.dls.corp.google.com","threadId":"38987","inReplyTo":"1428010016-12968-1-git-send-email-alexhenrie24@gmail.com","subject":"Re: [PATCH] standardize usage strings that were missed the first time","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-04-02T21:56:59Z","receivedAt":"2015-04-02T21:56:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Henrie <alexhenrie24@gmail.com> writes:\n\n> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.\n>\n> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>\n> ---\n\nThanks, but please no more _(\"string\") changes for the rest of the\ncycle, as that would impact i18n folks who will be starting from\ntagged -rc releases.\n\nPlease hold them off, and resend them after 2.4.0 final.\n\nThanks.\n\n>  builtin/blame.c | 2 +-\n>  builtin/log.c   | 2 +-\n>  2 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/builtin/blame.c b/builtin/blame.c\n> index 06484c2..0b2f4ed 100644\n> --- a/builtin/blame.c\n> +++ b/builtin/blame.c\n> @@ -27,7 +27,7 @@\n>  #include \"line-range.h\"\n>  #include \"line-log.h\"\n>  \n> -static char blame_usage[] = N_(\"git blame [<options>] [<rev-opts>] [<rev>] [--] file\");\n> +static char blame_usage[] = N_(\"git blame [<options>] [<rev-opts>] [<rev>] [--] <file>\");\n>  \n>  static const char *blame_opt_usage[] = {\n>  \tblame_usage,\n> diff --git a/builtin/log.c b/builtin/log.c\n> index dd8f3fc..4c4e6be 100644\n> --- a/builtin/log.c\n> +++ b/builtin/log.c\n> @@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = \"PATCH\";\n>  static const char *fmt_pretty;\n>  \n>  static const char * const builtin_log_usage[] = {\n> -\tN_(\"git log [<options>] [<revision range>] [[--] <path>...]\"),\n> +\tN_(\"git log [<options>] [<revision-range>] [[--] <path>...]\"),\n>  \tN_(\"git show [<options>] <object>...\"),\n>  \tNULL\n>  };\n"},{"id":"258960","messageId":"CAMMLpeQkZ2jsuBg_J6veHpGcZiwwSzt+8xQ1g+dL2G18SnBtPw@mail.gmail.com","threadId":"38987","inReplyTo":"xmqqego2i47o.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] standardize usage strings that were missed the first time","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2015-04-03T22:47:18Z","receivedAt":"2015-04-03T22:47:18Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"2015-04-02 15:56 GMT-06:00 Junio C Hamano <gitster@pobox.com>:\n> Thanks, but please no more _(\"string\") changes for the rest of the\n> cycle, as that would impact i18n folks who will be starting from\n> tagged -rc releases.\n>\n> Please hold them off, and resend them after 2.4.0 final.\n\nI thought that during a code freeze, you held onto patches or\ncommitted them to a staging branch. But it's OK, I will resend after\n2.4 final is released. Thanks for the clarification.\n\n-Alex\n"},{"id":"258965","messageId":"CAPc5daV7yf7X6y9-KAjGF2H=bq1T8gTR4729rDLFZtb-Pcs_TA@mail.gmail.com","threadId":"38987","inReplyTo":"CAMMLpeQkZ2jsuBg_J6veHpGcZiwwSzt+8xQ1g+dL2G18SnBtPw@mail.gmail.com","subject":"Re: [PATCH] standardize usage strings that were missed the first time","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-04-03T23:48:10Z","receivedAt":"2015-04-03T23:48:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"On Fri, Apr 3, 2015 at 3:47 PM, Alex Henrie <alexhenrie24@gmail.com> wrote:\n> 2015-04-02 15:56 GMT-06:00 Junio C Hamano <gitster@pobox.com>:\n>> Thanks, but please no more _(\"string\") changes for the rest of the\n>> cycle, as that would impact i18n folks who will be starting from\n>> tagged -rc releases.\n>>\n>> Please hold them off, and resend them after 2.4.0 final.\n>\n> I thought that during a code freeze, you held onto patches or\n> committed them to a staging branch.\n\nYes, but that is done as time-permits basis, and it is much more\nefficient to spread the load of remembering the topics that are\nneeded in future ;-)\n\nThanks.\n"}]}