[PATCH] Sync "git diff -h" with the manual, show options summary.

[PATCH] Sync "git diff -h" with the manual, show options summary.

[Yann Dirson]

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,
-- 
1.7.2.3

[PATCH] Sync "git diff -h" with the manual, show options summary.

[Yann Dirson]

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,
-- 
1.7.2.3

Re: [PATCH] Sync "git diff -h" with the manual, show options summary.

[Yann Dirson]

Hm, looks like I had sent those two small patches already, although
they got not feedback.

-- 
Yann

Re: [PATCH] Sync "git diff -h" with the manual, show options summary.

[Thiago Farina]

On Sat, Oct 23, 2010 at 11:33 AM, Yann Dirson <ydirson@altern.org> wrote:
> 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>*"

Why change from <options> to <common diff options> ?

Re: [PATCH] Sync "git diff -h" with the manual, show options summary.

[Matthieu Moy]

Thiago Farina <tfransosi@gmail.com> writes:

> On Sat, Oct 23, 2010 at 11:33 AM, Yann Dirson <ydirson@altern.org> wrote:
>>  static const char builtin_diff_usage[] =
>> -"git diff <options> <rev>{0,2} -- <path>*";
>> +"git diff [<common diff options>] <commit>{0,2} -- <path>*"
>
> Why change from <options> to <common diff options> ?

Because this is what the man page says I guess.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: [PATCH] Sync "git diff -h" with the manual, show options summary.

[Yann Dirson]

On Sat, Oct 23, 2010 at 08:04:26PM +0200, Matthieu Moy wrote:
> Thiago Farina <tfransosi@gmail.com> writes:
> 
> > On Sat, Oct 23, 2010 at 11:33 AM, Yann Dirson <ydirson@altern.org> wrote:
> >>  static const char builtin_diff_usage[] =
> >> -"git diff <options> <rev>{0,2} -- <path>*";
> >> +"git diff [<common diff options>] <commit>{0,2} -- <path>*"
> >
> > Why change from <options> to <common diff options> ?
> 
> Because this is what the man page says I guess.

Yes, as well as the usage strings for diff-tree, diff-files, and
diff-index.  "diff" was just the only one to be different here, and if
we want to keep "<options>" for conciseness here, we also probably
want to change it everywhere (or maybe "<diff options>" for the diff-*
commands ?) - after all, this is just a short usage string, not the
reference page.

Re: [PATCH] Sync "git diff -h" with the manual, show options summary.

[Štěpán Němec]

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