From: Štěpán Němec <stepnem@gmail.com>
Date: Sun, 24 Oct 2010 15:15:09 GMT
Subject: Re: [PATCH] Sync "git diff -h" with the manual, show options summary.
Message-ID: <87tykbpqpu.fsf@gmail.com>
In-Reply-To: <1287840825-6491-1-git-send-email-ydirson@altern.org>

Yann Dirson <ydirson@altern.org> writes:

> Signed-off-by: Yann Dirson <ydirson@altern.org>
> ---
>  builtin/diff.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/diff.c b/builtin/diff.c
> index a43d326..8736225 100644
> --- a/builtin/diff.c
> +++ b/builtin/diff.c
> @@ -22,7 +22,8 @@ struct blobinfo {
>  };
>  
>  static const char builtin_diff_usage[] =
> -"git diff <options> <rev>{0,2} -- <path>*";
> +"git diff [<common diff options>] <commit>{0,2} -- <path>*"
> +COMMON_DIFF_OPTIONS_HELP;
>  
>  static void stuff_change(struct diff_options *opt,
>  			 unsigned old_mode, unsigned new_mode,

When at it, could you please also use [<path>...] instead of <path>*?
That's what the man pages and other usage strings use.

Štěpán