threads / patch / 39219

patchstandardize usage strings that were missed the first time

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

## tl;dr

5 messages between May 2, 2015 and May 4, 2015. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Alex Henrie· May 2, 2015, 03:12 UTC · lore
This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 builtin/blame.c | 2 +-
 builtin/log.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −2

builtin/blame.c, builtin/log.c

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.7
Junio C Hamano· May 3, 2015, 17:18 UTC · re: Alex Henrie · lore

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

Alex Henrie <alexhenrie24@gmail.com> writes:
> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.
Please do not force the reader to type "git show 9c9b4f2".
Show 33 quoted lines
>
> Signed-off-by: Alex Henrie <alexhenrie24@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
>  };
Junio C Hamano· May 3, 2015, 23:59 UTC · re: Junio C Hamano · lore

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

Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> Alex Henrie <alexhenrie24@gmail.com> writes:
>
>> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.
>
> Please do not force the reader to type "git show 9c9b4f2".
Here is my attempt.
commit ce41720cad79d858f09ebfc88cf84a4b152645c7
Author: Alex Henrie <alexhenrie24@gmail.com>
Date:   Thu Apr 2 15:26:56 2015 -0600
    blame, log: format usage strings similarly to those in documentation
    
    Earlier, 9c9b4f2f (standardize usage info string format, 2015-01-13)
    tried to make usage-string in line with the documentation by
    
        - Placing angle brackets around fill-in-the-blank parameters
        - Putting dashes in multiword parameter names
        - Adding spaces to [-f|--foobar] to make [-f | --foobar]
        - Replacing <foobar>* with [<foobar>...]
    
    but it missed a few places.
    
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Henrie· May 4, 2015, 17:49 UTC · re: Junio C Hamano · lore

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

2015-05-03 17:59 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
Show 20 quoted lines
> Here is my attempt.
>
> commit ce41720cad79d858f09ebfc88cf84a4b152645c7
> Author: Alex Henrie <alexhenrie24@gmail.com>
> Date:   Thu Apr 2 15:26:56 2015 -0600
>
>     blame, log: format usage strings similarly to those in documentation
>
>     Earlier, 9c9b4f2f (standardize usage info string format, 2015-01-13)
>     tried to make usage-string in line with the documentation by
>
>         - Placing angle brackets around fill-in-the-blank parameters
>         - Putting dashes in multiword parameter names
>         - Adding spaces to [-f|--foobar] to make [-f | --foobar]
>         - Replacing <foobar>* with [<foobar>...]
>
>     but it missed a few places.
>
>     Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
>     Signed-off-by: Junio C Hamano <gitster@pobox.com>
Looks great, thank you.
-Alex
Junio C Hamano· May 4, 2015, 19:23 UTC · re: Alex Henrie · lore

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

Alex Henrie <alexhenrie24@gmail.com> writes:
Show 7 quoted lines
> 2015-05-03 17:59 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
>> Here is my attempt.
>> ...
>
> Looks great, thank you.
>
> -Alex
Thanks.

← back to recent threads