{"thread":{"id":"25532","subject":"[PATCH] Sync \"git diff -h\" with the manual, show options summary.","startedAt":"2010-10-23T13:33:45Z","lastAt":"2010-10-24T15:15:09Z","messageCount":6,"participants":["Yann Dirson","Thiago Farina","Matthieu Moy","Štěpán Němec"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"154240","messageId":"1287840825-6491-1-git-send-email-ydirson@altern.org","threadId":"25532","inReplyTo":null,"subject":"[PATCH] Sync \"git diff -h\" with the manual, show options summary.","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2010-10-23T13:33:45Z","receivedAt":"2010-10-23T13:33:45Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"Signed-off-by: Yann Dirson <ydirson@altern.org>\n---\n builtin/diff.c |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin/diff.c b/builtin/diff.c\nindex a43d326..8736225 100644\n--- a/builtin/diff.c\n+++ b/builtin/diff.c\n@@ -22,7 +22,8 @@ struct blobinfo {\n };\n \n static const char builtin_diff_usage[] =\n-\"git diff <options> <rev>{0,2} -- <path>*\";\n+\"git diff [<common diff options>] <commit>{0,2} -- <path>*\"\n+COMMON_DIFF_OPTIONS_HELP;\n \n static void stuff_change(struct diff_options *opt,\n \t\t\t unsigned old_mode, unsigned new_mode,\n-- \n1.7.2.3\n"},{"id":"154242","messageId":"20101023140755.GO4983@home.lan","threadId":"25532","inReplyTo":"1287840825-6491-1-git-send-email-ydirson@altern.org","subject":"Re: [PATCH] Sync \"git diff -h\" with the manual, show options summary.","fromName":"Yann Dirson","fromEmail":"ydirson@free.fr","sentAt":"2010-10-23T14:07:55Z","receivedAt":"2010-10-23T14:07:55Z","isPatch":true,"sender":{"key":"ydirson@free.fr","avatar":null},"body":"Hm, looks like I had sent those two small patches already, although\nthey got not feedback.\n\n-- \nYann\n"},{"id":"154260","messageId":"AANLkTi=kETrjKccdVo188mKjX59mWeCRLVwGpiVP-oQ1@mail.gmail.com","threadId":"25532","inReplyTo":"1287840825-6491-1-git-send-email-ydirson@altern.org","subject":"Re: [PATCH] Sync \"git diff -h\" with the manual, show options summary.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2010-10-23T18:02:49Z","receivedAt":"2010-10-23T18:02:49Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"On Sat, Oct 23, 2010 at 11:33 AM, Yann Dirson <ydirson@altern.org> wrote:\n> Signed-off-by: Yann Dirson <ydirson@altern.org>\n> ---\n>  builtin/diff.c |    3 ++-\n>  1 files changed, 2 insertions(+), 1 deletions(-)\n>\n> diff --git a/builtin/diff.c b/builtin/diff.c\n> index a43d326..8736225 100644\n> --- a/builtin/diff.c\n> +++ b/builtin/diff.c\n> @@ -22,7 +22,8 @@ struct blobinfo {\n>  };\n>\n>  static const char builtin_diff_usage[] =\n> -\"git diff <options> <rev>{0,2} -- <path>*\";\n> +\"git diff [<common diff options>] <commit>{0,2} -- <path>*\"\n\nWhy change from <options> to <common diff options> ?\n"},{"id":"154261","messageId":"vpqvd4sn5ud.fsf@bauges.imag.fr","threadId":"25532","inReplyTo":"AANLkTi=kETrjKccdVo188mKjX59mWeCRLVwGpiVP-oQ1@mail.gmail.com","subject":"Re: [PATCH] Sync \"git diff -h\" with the manual, show options summary.","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-10-23T18:04:26Z","receivedAt":"2010-10-23T18:04:26Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Thiago Farina <tfransosi@gmail.com> writes:\n\n> On Sat, Oct 23, 2010 at 11:33 AM, Yann Dirson <ydirson@altern.org> wrote:\n>>  static const char builtin_diff_usage[] =\n>> -\"git diff <options> <rev>{0,2} -- <path>*\";\n>> +\"git diff [<common diff options>] <commit>{0,2} -- <path>*\"\n>\n> Why change from <options> to <common diff options> ?\n\nBecause this is what the man page says I guess.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"154265","messageId":"20101023184425.GP4983@home.lan","threadId":"25532","inReplyTo":"vpqvd4sn5ud.fsf@bauges.imag.fr","subject":"Re: [PATCH] Sync \"git diff -h\" with the manual, show options summary.","fromName":"Yann Dirson","fromEmail":"ydirson@free.fr","sentAt":"2010-10-23T18:44:25Z","receivedAt":"2010-10-23T18:44:25Z","isPatch":true,"sender":{"key":"ydirson@free.fr","avatar":null},"body":"On Sat, Oct 23, 2010 at 08:04:26PM +0200, Matthieu Moy wrote:\n> Thiago Farina <tfransosi@gmail.com> writes:\n> \n> > On Sat, Oct 23, 2010 at 11:33 AM, Yann Dirson <ydirson@altern.org> wrote:\n> >>  static const char builtin_diff_usage[] =\n> >> -\"git diff <options> <rev>{0,2} -- <path>*\";\n> >> +\"git diff [<common diff options>] <commit>{0,2} -- <path>*\"\n> >\n> > Why change from <options> to <common diff options> ?\n> \n> Because this is what the man page says I guess.\n\nYes, as well as the usage strings for diff-tree, diff-files, and\ndiff-index.  \"diff\" was just the only one to be different here, and if\nwe want to keep \"<options>\" for conciseness here, we also probably\nwant to change it everywhere (or maybe \"<diff options>\" for the diff-*\ncommands ?) - after all, this is just a short usage string, not the\nreference page.\n"},{"id":"154335","messageId":"87tykbpqpu.fsf@gmail.com","threadId":"25532","inReplyTo":"1287840825-6491-1-git-send-email-ydirson@altern.org","subject":"Re: [PATCH] Sync \"git diff -h\" with the manual, show options summary.","fromName":"Štěpán Němec","fromEmail":"stepnem@gmail.com","sentAt":"2010-10-24T15:15:09Z","receivedAt":"2010-10-24T15:15:09Z","isPatch":true,"sender":{"key":"stepnem@gmail.com","avatar":"https://avatars.githubusercontent.com/u/106838?v=4"},"body":"Yann Dirson <ydirson@altern.org> writes:\n\n> Signed-off-by: Yann Dirson <ydirson@altern.org>\n> ---\n>  builtin/diff.c |    3 ++-\n>  1 files changed, 2 insertions(+), 1 deletions(-)\n>\n> diff --git a/builtin/diff.c b/builtin/diff.c\n> index a43d326..8736225 100644\n> --- a/builtin/diff.c\n> +++ b/builtin/diff.c\n> @@ -22,7 +22,8 @@ struct blobinfo {\n>  };\n>  \n>  static const char builtin_diff_usage[] =\n> -\"git diff <options> <rev>{0,2} -- <path>*\";\n> +\"git diff [<common diff options>] <commit>{0,2} -- <path>*\"\n> +COMMON_DIFF_OPTIONS_HELP;\n>  \n>  static void stuff_change(struct diff_options *opt,\n>  \t\t\t unsigned old_mode, unsigned new_mode,\n\nWhen at it, could you please also use [<path>...] instead of <path>*?\nThat's what the man pages and other usage strings use.\n\nŠtěpán\n"}]}