* [PATCH] Sync "git diff -h" with the manual, show options summary.
@ 2010-10-23 13:33 Yann Dirson
2010-10-23 14:07 ` Yann Dirson
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Yann Dirson @ 2010-10-23 13:33 UTC (permalink / raw)
To: git; +Cc: 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Sync "git diff -h" with the manual, show options summary.
2010-10-23 13:33 [PATCH] Sync "git diff -h" with the manual, show options summary Yann Dirson
@ 2010-10-23 14:07 ` Yann Dirson
2010-10-23 18:02 ` Thiago Farina
2010-10-24 15:15 ` Štěpán Němec
2 siblings, 0 replies; 7+ messages in thread
From: Yann Dirson @ 2010-10-23 14:07 UTC (permalink / raw)
To: git
Hm, looks like I had sent those two small patches already, although
they got not feedback.
--
Yann
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Sync "git diff -h" with the manual, show options summary.
2010-10-23 13:33 [PATCH] Sync "git diff -h" with the manual, show options summary Yann Dirson
2010-10-23 14:07 ` Yann Dirson
@ 2010-10-23 18:02 ` Thiago Farina
2010-10-23 18:04 ` Matthieu Moy
2010-10-24 15:15 ` Štěpán Němec
2 siblings, 1 reply; 7+ messages in thread
From: Thiago Farina @ 2010-10-23 18:02 UTC (permalink / raw)
To: Yann Dirson; +Cc: git
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> ?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Sync "git diff -h" with the manual, show options summary.
2010-10-23 18:02 ` Thiago Farina
@ 2010-10-23 18:04 ` Matthieu Moy
2010-10-23 18:44 ` Yann Dirson
0 siblings, 1 reply; 7+ messages in thread
From: Matthieu Moy @ 2010-10-23 18:04 UTC (permalink / raw)
To: Thiago Farina; +Cc: Yann Dirson, git
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/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Sync "git diff -h" with the manual, show options summary.
2010-10-23 18:04 ` Matthieu Moy
@ 2010-10-23 18:44 ` Yann Dirson
0 siblings, 0 replies; 7+ messages in thread
From: Yann Dirson @ 2010-10-23 18:44 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Thiago Farina, git
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Sync "git diff -h" with the manual, show options summary.
2010-10-23 13:33 [PATCH] Sync "git diff -h" with the manual, show options summary Yann Dirson
2010-10-23 14:07 ` Yann Dirson
2010-10-23 18:02 ` Thiago Farina
@ 2010-10-24 15:15 ` Štěpán Němec
2 siblings, 0 replies; 7+ messages in thread
From: Štěpán Němec @ 2010-10-24 15:15 UTC (permalink / raw)
To: Yann Dirson; +Cc: git
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Sync "git diff -h" with the manual, show options summary.
@ 2010-10-01 7:32 Yann Dirson
0 siblings, 0 replies; 7+ messages in thread
From: Yann Dirson @ 2010-10-01 7:32 UTC (permalink / raw)
To: git; +Cc: 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-10-24 15:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-23 13:33 [PATCH] Sync "git diff -h" with the manual, show options summary Yann Dirson
2010-10-23 14:07 ` Yann Dirson
2010-10-23 18:02 ` Thiago Farina
2010-10-23 18:04 ` Matthieu Moy
2010-10-23 18:44 ` Yann Dirson
2010-10-24 15:15 ` Štěpán Němec
-- strict thread matches above, loose matches on Subject: below --
2010-10-01 7:32 Yann Dirson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.