Re: [PATCH] standardize usage strings that were missed the first time

2015-04-03 Thread Junio C Hamano 
On Fri, Apr 3, 2015 at 3:47 PM, Alex Henrie alexhenri...@gmail.com wrote:
 2015-04-02 15:56 GMT-06:00 Junio C Hamano gits...@pobox.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.

 I thought that during a code freeze, you held onto patches or
 committed them to a staging branch.

Yes, but that is done as time-permits basis, and it is much more
efficient to spread the load of remembering the topics that are
needed in future ;-)

Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] standardize usage strings that were missed the first time

2015-04-03 Thread Alex Henrie 
2015-04-02 15:56 GMT-06:00 Junio C Hamano gits...@pobox.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.

I thought that during a code freeze, you held onto patches or
committed them to a staging branch. But it's OK, I will resend after
2.4 final is released. Thanks for the clarification.

-Alex
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] standardize usage strings that were missed the first time

2015-04-02 Thread Alex Henrie 
This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 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
 };
-- 
2.3.5

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] standardize usage strings that were missed the first time

2015-04-02 Thread Junio C Hamano 
Alex Henrie alexhenri...@gmail.com writes:

 This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.

 Signed-off-by: Alex Henrie alexhenri...@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
  };
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html