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

5 messages from 2015-05-02 to 2015-05-04. Participants: Alex Henrie, Junio C Hamano.
Thread: https://gitlist.dev/t/39219

## Alex Henrie, 2015-05-02 03:12

Subject: [PATCH] standardize usage strings that were missed the first time
Message-ID: <1430536341-21847-1-git-send-email-alexhenrie24@gmail.com>
URL: https://gitlist.dev/e/1430536341-21847-1-git-send-email-alexhenrie24%40gmail.com

```
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(-)

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, 2015-05-03 17:18

Subject: Re: [PATCH] standardize usage strings that were missed the first time
Message-ID: <xmqq383dwpf4.fsf@gitster.dls.corp.google.com>
URL: https://gitlist.dev/e/xmqq383dwpf4.fsf%40gitster.dls.corp.google.com
In-Reply-To: <1430536341-21847-1-git-send-email-alexhenrie24@gmail.com>

```
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".

>
> 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, 2015-05-03 23:59

Subject: Re: [PATCH] standardize usage strings that were missed the first time
Message-ID: <xmqq4mntusad.fsf@gitster.dls.corp.google.com>
URL: https://gitlist.dev/e/xmqq4mntusad.fsf%40gitster.dls.corp.google.com
In-Reply-To: <xmqq383dwpf4.fsf@gitster.dls.corp.google.com>

```
Junio C Hamano <gitster@pobox.com> writes:

> 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, 2015-05-04 17:49

Subject: Re: [PATCH] standardize usage strings that were missed the first time
Message-ID: <CAMMLpeTNfe3zZgkApoXV=_Kj+bzfU1YBtyKtoPu00e8eTza_WA@mail.gmail.com>
URL: https://gitlist.dev/e/CAMMLpeTNfe3zZgkApoXV%3D_Kj%2BbzfU1YBtyKtoPu00e8eTza_WA%40mail.gmail.com
In-Reply-To: <xmqq4mntusad.fsf@gitster.dls.corp.google.com>

```
2015-05-03 17:59 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
> 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, 2015-05-04 19:23

Subject: Re: [PATCH] standardize usage strings that were missed the first time
Message-ID: <xmqqr3qwrvsj.fsf@gitster.dls.corp.google.com>
URL: https://gitlist.dev/e/xmqqr3qwrvsj.fsf%40gitster.dls.corp.google.com
In-Reply-To: <CAMMLpeTNfe3zZgkApoXV=_Kj+bzfU1YBtyKtoPu00e8eTza_WA@mail.gmail.com>

```
Alex Henrie <alexhenrie24@gmail.com> writes:

> 2015-05-03 17:59 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
>> Here is my attempt.
>> ...
>
> Looks great, thank you.
>
> -Alex

Thanks.

```