{"thread":{"id":"13273","subject":"[PATCH 1/2] Documentation: move options of git-diff-tree to a separate file.","startedAt":"2008-04-26T21:01:06Z","lastAt":"2008-05-13T09:16:18Z","messageCount":11,"participants":["Miklos Vajna","Junio C Hamano","しらいしななこ"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"75236","messageId":"b57b2d5d484b6e099382900069ed6ca2afc6922d.1209243527.git.vmiklos@frugalware.org","threadId":"13273","inReplyTo":null,"subject":"[PATCH 1/2] Documentation: move options of git-diff-tree to a separate file.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-04-26T21:01:06Z","receivedAt":"2008-04-26T21:01:06Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"These options are used by high-level commands, like git-show; moving the\noptions to a separate file makes it possible to include the options in\nthe high-level manges as well.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n Documentation/diff-tree-options.txt |   64 +++++++++++++++++++++++++++++++++\n Documentation/git-diff-tree.txt     |   66 +---------------------------------\n 2 files changed, 66 insertions(+), 64 deletions(-)\n create mode 100644 Documentation/diff-tree-options.txt\n\ndiff --git a/Documentation/diff-tree-options.txt b/Documentation/diff-tree-options.txt\nnew file mode 100644\nindex 0000000..24a47f4\n--- /dev/null\n+++ b/Documentation/diff-tree-options.txt\n@@ -0,0 +1,64 @@\n+-r::\n+        recurse into sub-trees\n+\n+-t::\n+\tshow tree entry itself as well as subtrees.  Implies -r.\n+\n+--root::\n+\tWhen '--root' is specified the initial commit will be showed as a big\n+\tcreation event. This is equivalent to a diff against the NULL tree.\n+\n+--stdin::\n+\tWhen '--stdin' is specified, the command does not take\n+\t<tree-ish> arguments from the command line.  Instead, it\n+\treads either one <commit> or a pair of <tree-ish>\n+\tseparated with a single space from its standard input.\n++\n+When a single commit is given on one line of such input, it compares\n+the commit with its parents.  The following flags further affects its\n+behavior.  This does not apply to the case where two <tree-ish>\n+separated with a single space are given.\n+\n+-m::\n+\tBy default, \"--stdin\" does not show\n+\tdifferences for merge commits.  With this flag, it shows\n+\tdifferences to that commit from all of its parents. See\n+\talso '-c'.\n+\n+-s::\n+\tBy default, \"--stdin\" shows differences,\n+\teither in machine-readable form (without '-p') or in patch\n+\tform (with '-p').  This output can be suppressed.  It is\n+\tonly useful with '-v' flag.\n+\n+-v::\n+\tThis flag causes \"--stdin\" to also show\n+\tthe commit message before the differences.\n+\n+--no-commit-id::\n+\tThe output contains a line with the commit ID when\n+\tapplicable.  This flag suppressed the commit ID output.\n+\n+-c::\n+\tThis flag changes the way a merge commit is displayed\n+\t(which means it is useful only when the command is given\n+\tone <tree-ish>, or '--stdin').  It shows the differences\n+\tfrom each of the parents to the merge result simultaneously\n+\tinstead of showing pairwise diff between a parent and the\n+\tresult one at a time (which is what the '-m' option does).\n+\tFurthermore, it lists only files which were modified\n+\tfrom all parents.\n+\n+--cc::\n+\tThis flag changes the way a merge commit patch is displayed,\n+\tin a similar way to the '-c' option. It implies the '-c'\n+\tand '-p' options and further compresses the patch output\n+\tby omitting hunks that show differences from only one\n+\tparent, or show the same change from all but one parent\n+\tfor an Octopus merge.  When this optimization makes all\n+\thunks disappear, the commit itself and the commit log\n+\tmessage is not shown, just like in any other \"empty diff\" case.\n+\n+--always::\n+\tShow the commit itself and the commit log message even\n+\tif the diff itself is empty.\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 58d02c6..b91cbde 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -36,72 +36,10 @@ include::diff-options.txt[]\n \tNote that this parameter does not provide any wildcard or regexp\n \tfeatures.\n \n--r::\n-        recurse into sub-trees\n-\n--t::\n-\tshow tree entry itself as well as subtrees.  Implies -r.\n-\n---root::\n-\tWhen '--root' is specified the initial commit will be showed as a big\n-\tcreation event. This is equivalent to a diff against the NULL tree.\n-\n---stdin::\n-\tWhen '--stdin' is specified, the command does not take\n-\t<tree-ish> arguments from the command line.  Instead, it\n-\treads either one <commit> or a pair of <tree-ish>\n-\tseparated with a single space from its standard input.\n-+\n-When a single commit is given on one line of such input, it compares\n-the commit with its parents.  The following flags further affects its\n-behavior.  This does not apply to the case where two <tree-ish>\n-separated with a single space are given.\n-\n--m::\n-\tBy default, \"git-diff-tree --stdin\" does not show\n-\tdifferences for merge commits.  With this flag, it shows\n-\tdifferences to that commit from all of its parents. See\n-\talso '-c'.\n-\n--s::\n-\tBy default, \"git-diff-tree --stdin\" shows differences,\n-\teither in machine-readable form (without '-p') or in patch\n-\tform (with '-p').  This output can be suppressed.  It is\n-\tonly useful with '-v' flag.\n-\n--v::\n-\tThis flag causes \"git-diff-tree --stdin\" to also show\n-\tthe commit message before the differences.\n+include::diff-tree-options.txt[]\n \n-include::pretty-options.txt[]\n \n---no-commit-id::\n-\tgit-diff-tree outputs a line with the commit ID when\n-\tapplicable.  This flag suppressed the commit ID output.\n-\n--c::\n-\tThis flag changes the way a merge commit is displayed\n-\t(which means it is useful only when the command is given\n-\tone <tree-ish>, or '--stdin').  It shows the differences\n-\tfrom each of the parents to the merge result simultaneously\n-\tinstead of showing pairwise diff between a parent and the\n-\tresult one at a time (which is what the '-m' option does).\n-\tFurthermore, it lists only files which were modified\n-\tfrom all parents.\n-\n---cc::\n-\tThis flag changes the way a merge commit patch is displayed,\n-\tin a similar way to the '-c' option. It implies the '-c'\n-\tand '-p' options and further compresses the patch output\n-\tby omitting hunks that show differences from only one\n-\tparent, or show the same change from all but one parent\n-\tfor an Octopus merge.  When this optimization makes all\n-\thunks disappear, the commit itself and the commit log\n-\tmessage is not shown, just like in any other \"empty diff\" case.\n-\n---always::\n-\tShow the commit itself and the commit log message even\n-\tif the diff itself is empty.\n+include::pretty-options.txt[]\n \n \n include::pretty-formats.txt[]\n-- \n1.5.5.1\n"},{"id":"75237","messageId":"499fc547c6316f25967c71f0991a027482dab349.1209243527.git.vmiklos@frugalware.org","threadId":"13273","inReplyTo":"b57b2d5d484b6e099382900069ed6ca2afc6922d.1209243527.git.vmiklos@frugalware.org","subject":"[PATCH 2/2] Documentation: include diff-tree-options in git-show manpage.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-04-26T21:01:07Z","receivedAt":"2008-04-26T21:01:07Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n Documentation/git-show.txt |    9 +++------\n 1 files changed, 3 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\nindex dccf0e2..b1fa879 100644\n--- a/Documentation/git-show.txt\n+++ b/Documentation/git-show.txt\n@@ -25,12 +25,6 @@ with \\--name-only).\n \n For plain blobs, it shows the plain contents.\n \n-The command takes options applicable to the linkgit:git-diff-tree[1] command to\n-control how the changes the commit introduces are shown.\n-\n-This manual page describes only the most frequently used options.\n-\n-\n OPTIONS\n -------\n <object>::\n@@ -38,6 +32,9 @@ OPTIONS\n \tFor a more complete list of ways to spell object names, see\n \t\"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1].\n \n+include::diff-tree-options.txt[]\n+\n+\n include::pretty-options.txt[]\n \n \n-- \n1.5.5.1\n"},{"id":"75246","messageId":"7vod7wkuue.fsf@gitster.siamese.dyndns.org","threadId":"13273","inReplyTo":"b57b2d5d484b6e099382900069ed6ca2afc6922d.1209243527.git.vmiklos@frugalware.org","subject":"Re: [PATCH 1/2] Documentation: move options of git-diff-tree to a separate file.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-27T00:24:57Z","receivedAt":"2008-04-27T00:24:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna <vmiklos@frugalware.org> writes:\n\n> +--stdin::\n> +\tWhen '--stdin' is specified, the command does not take\n> +\t<tree-ish> arguments from the command line.  Instead, it\n> +\treads either one <commit> or a pair of <tree-ish>\n> +\tseparated with a single space from its standard input.\n\nAre you sure \"git show\" takes --stdin?\n\nAlso for \"show\", listing --cc as one of the options does not make much\nsense, as that is an unoverridable default.\n\nAnd no, making it overridable so that it can take -m to show independent\ndiff against each parent of a merge commit do not make much sense in the\ncontext of \"git show\".\n"},{"id":"75248","messageId":"1209262661-14370-1-git-send-email-vmiklos@frugalware.org","threadId":"13273","inReplyTo":"7vod7wkuue.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Documentation: move options of git-diff-tree to a separate file.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-04-27T02:17:41Z","receivedAt":"2008-04-27T02:17:41Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"These options are used by high-level commands, like git-show; moving the\noptions to a separate file makes it possible to include the options in\nthe high-level manges as well.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nOn Sat, Apr 26, 2008 at 05:24:57PM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> Are you sure \"git show\" takes --stdin?\n>\n> Also for \"show\", listing --cc as one of the options does not make much\n> sense, as that is an unoverridable default.\n>\n> And no, making it overridable so that it can take -m to show\n> independent\n> diff against each parent of a merge commit do not make much sense in\n> the\n> context of \"git show\".\n\nRight, --stdin and --cc is not something I should move\nto diff-tree-options.txt. Updated patch below.\n\n Documentation/diff-tree-options.txt |   43 ++++++++++++++++++++++++++++++\n Documentation/git-diff-tree.txt     |   49 +++--------------------------------\n 2 files changed, 47 insertions(+), 45 deletions(-)\n create mode 100644 Documentation/diff-tree-options.txt\n\ndiff --git a/Documentation/diff-tree-options.txt b/Documentation/diff-tree-options.txt\nnew file mode 100644\nindex 0000000..3049ede\n--- /dev/null\n+++ b/Documentation/diff-tree-options.txt\n@@ -0,0 +1,43 @@\n+-r::\n+        recurse into sub-trees\n+\n+-t::\n+\tshow tree entry itself as well as subtrees.  Implies -r.\n+\n+--root::\n+\tWhen '--root' is specified the initial commit will be showed as a big\n+\tcreation event. This is equivalent to a diff against the NULL tree.\n+\n+-m::\n+\tBy default, \"--stdin\" does not show\n+\tdifferences for merge commits.  With this flag, it shows\n+\tdifferences to that commit from all of its parents. See\n+\talso '-c'.\n+\n+-s::\n+\tBy default, \"--stdin\" shows differences,\n+\teither in machine-readable form (without '-p') or in patch\n+\tform (with '-p').  This output can be suppressed.  It is\n+\tonly useful with '-v' flag.\n+\n+-v::\n+\tThis flag causes \"--stdin\" to also show\n+\tthe commit message before the differences.\n+\n+--no-commit-id::\n+\tThe output contains a line with the commit ID when\n+\tapplicable.  This flag suppressed the commit ID output.\n+\n+-c::\n+\tThis flag changes the way a merge commit is displayed\n+\t(which means it is useful only when the command is given\n+\tone <tree-ish>, or '--stdin').  It shows the differences\n+\tfrom each of the parents to the merge result simultaneously\n+\tinstead of showing pairwise diff between a parent and the\n+\tresult one at a time (which is what the '-m' option does).\n+\tFurthermore, it lists only files which were modified\n+\tfrom all parents.\n+\n+--always::\n+\tShow the commit itself and the commit log message even\n+\tif the diff itself is empty.\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 58d02c6..55345df 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -36,16 +36,6 @@ include::diff-options.txt[]\n \tNote that this parameter does not provide any wildcard or regexp\n \tfeatures.\n \n--r::\n-        recurse into sub-trees\n-\n--t::\n-\tshow tree entry itself as well as subtrees.  Implies -r.\n-\n---root::\n-\tWhen '--root' is specified the initial commit will be showed as a big\n-\tcreation event. This is equivalent to a diff against the NULL tree.\n-\n --stdin::\n \tWhen '--stdin' is specified, the command does not take\n \t<tree-ish> arguments from the command line.  Instead, it\n@@ -57,38 +47,6 @@ the commit with its parents.  The following flags further affects its\n behavior.  This does not apply to the case where two <tree-ish>\n separated with a single space are given.\n \n--m::\n-\tBy default, \"git-diff-tree --stdin\" does not show\n-\tdifferences for merge commits.  With this flag, it shows\n-\tdifferences to that commit from all of its parents. See\n-\talso '-c'.\n-\n--s::\n-\tBy default, \"git-diff-tree --stdin\" shows differences,\n-\teither in machine-readable form (without '-p') or in patch\n-\tform (with '-p').  This output can be suppressed.  It is\n-\tonly useful with '-v' flag.\n-\n--v::\n-\tThis flag causes \"git-diff-tree --stdin\" to also show\n-\tthe commit message before the differences.\n-\n-include::pretty-options.txt[]\n-\n---no-commit-id::\n-\tgit-diff-tree outputs a line with the commit ID when\n-\tapplicable.  This flag suppressed the commit ID output.\n-\n--c::\n-\tThis flag changes the way a merge commit is displayed\n-\t(which means it is useful only when the command is given\n-\tone <tree-ish>, or '--stdin').  It shows the differences\n-\tfrom each of the parents to the merge result simultaneously\n-\tinstead of showing pairwise diff between a parent and the\n-\tresult one at a time (which is what the '-m' option does).\n-\tFurthermore, it lists only files which were modified\n-\tfrom all parents.\n-\n --cc::\n \tThis flag changes the way a merge commit patch is displayed,\n \tin a similar way to the '-c' option. It implies the '-c'\n@@ -99,9 +57,10 @@ include::pretty-options.txt[]\n \thunks disappear, the commit itself and the commit log\n \tmessage is not shown, just like in any other \"empty diff\" case.\n \n---always::\n-\tShow the commit itself and the commit log message even\n-\tif the diff itself is empty.\n+include::diff-tree-options.txt[]\n+\n+\n+include::pretty-options.txt[]\n \n \n include::pretty-formats.txt[]\n-- \n1.5.5.1\n"},{"id":"75273","messageId":"200804270730.m3R7UTTn011092@mi1.bluebottle.com","threadId":"13273","inReplyTo":"1209262661-14370-1-git-send-email-vmiklos@frugalware.org","subject":"Re: [PATCH] Documentation: move options of git-diff-tree to a separate file.","fromName":"しらいしななこ","fromEmail":"nanako3@bluebottle.com","sentAt":"2008-04-27T07:29:55Z","receivedAt":"2008-04-27T07:29:55Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Miklos Vajna <vmiklos@frugalware.org>:\n\n> On Sat, Apr 26, 2008 at 05:24:57PM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n>> Are you sure \"git show\" takes --stdin?\n>>\n>> Also for \"show\", listing --cc as one of the options does not make much\n>> sense, as that is an unoverridable default.\n>>\n>> And no, making it overridable so that it can take -m to show\n>> independent\n>> diff against each parent of a merge commit do not make much sense in\n>> the\n>> context of \"git show\".\n>\n> Right, --stdin and --cc is not something I should move\n> to diff-tree-options.txt. Updated patch below.\n\nI do not know if the updated patch is correct either.\n\nDid you try \"git show\" with the options you have in the new \"tree-options\" file, for example \"git show --root HEAD\", and checked to make sure they make sense?\n\nI think \"git show -s\" makes sense as it is easier to type than \"git log -1\" but I do not think any other options you listed makes sense with \"git show\".\n\n>\n>  Documentation/diff-tree-options.txt |   43 ++++++++++++++++++++++++++++++\n>  Documentation/git-diff-tree.txt     |   49 +++--------------------------------\n>  2 files changed, 47 insertions(+), 45 deletions(-)\n>  create mode 100644 Documentation/diff-tree-options.txt\n>\n> diff --git a/Documentation/diff-tree-options.txt b/Documentation/diff-tree-options.txt\n> new file mode 100644\n> index 0000000..3049ede\n> --- /dev/null\n> +++ b/Documentation/diff-tree-options.txt\n> @@ -0,0 +1,43 @@\n> +-r::\n> +        recurse into sub-trees\n> +\n> +-t::\n> +\tshow tree entry itself as well as subtrees.  Implies -r.\n> +\n> +--root::\n> +\tWhen '--root' is specified the initial commit will be showed as a big\n> +\tcreation event. This is equivalent to a diff against the NULL tree.\n> +\n> +-m::\n> +\tBy default, \"--stdin\" does not show\n> +\tdifferences for merge commits.  With this flag, it shows\n> +\tdifferences to that commit from all of its parents. See\n> +\talso '-c'.\n> +\n> +-s::\n> +\tBy default, \"--stdin\" shows differences,\n> +\teither in machine-readable form (without '-p') or in patch\n> +\tform (with '-p').  This output can be suppressed.  It is\n> +\tonly useful with '-v' flag.\n> +\n> +-v::\n> +\tThis flag causes \"--stdin\" to also show\n> +\tthe commit message before the differences.\n> +\n> +--no-commit-id::\n> +\tThe output contains a line with the commit ID when\n> +\tapplicable.  This flag suppressed the commit ID output.\n> +\n> +-c::\n> +\tThis flag changes the way a merge commit is displayed\n> +\t(which means it is useful only when the command is given\n> +\tone <tree-ish>, or '--stdin').  It shows the differences\n> +\tfrom each of the parents to the merge result simultaneously\n> +\tinstead of showing pairwise diff between a parent and the\n> +\tresult one at a time (which is what the '-m' option does).\n> +\tFurthermore, it lists only files which were modified\n> +\tfrom all parents.\n> +\n> +--always::\n> +\tShow the commit itself and the commit log message even\n> +\tif the diff itself is empty.\n> diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\n> index 58d02c6..55345df 100644\n> --- a/Documentation/git-diff-tree.txt\n> +++ b/Documentation/git-diff-tree.txt\n> @@ -36,16 +36,6 @@ include::diff-options.txt[]\n>  \tNote that this parameter does not provide any wildcard or regexp\n>  \tfeatures.\n>  \n> --r::\n> -        recurse into sub-trees\n> -\n> --t::\n> -\tshow tree entry itself as well as subtrees.  Implies -r.\n> -\n> ---root::\n> -\tWhen '--root' is specified the initial commit will be showed as a big\n> -\tcreation event. This is equivalent to a diff against the NULL tree.\n> -\n>  --stdin::\n>  \tWhen '--stdin' is specified, the command does not take\n>  \t<tree-ish> arguments from the command line.  Instead, it\n> @@ -57,38 +47,6 @@ the commit with its parents.  The following flags further affects its\n>  behavior.  This does not apply to the case where two <tree-ish>\n>  separated with a single space are given.\n>  \n> --m::\n> -\tBy default, \"git-diff-tree --stdin\" does not show\n> -\tdifferences for merge commits.  With this flag, it shows\n> -\tdifferences to that commit from all of its parents. See\n> -\talso '-c'.\n> -\n> --s::\n> -\tBy default, \"git-diff-tree --stdin\" shows differences,\n> -\teither in machine-readable form (without '-p') or in patch\n> -\tform (with '-p').  This output can be suppressed.  It is\n> -\tonly useful with '-v' flag.\n> -\n> --v::\n> -\tThis flag causes \"git-diff-tree --stdin\" to also show\n> -\tthe commit message before the differences.\n> -\n> -include::pretty-options.txt[]\n> -\n> ---no-commit-id::\n> -\tgit-diff-tree outputs a line with the commit ID when\n> -\tapplicable.  This flag suppressed the commit ID output.\n> -\n> --c::\n> -\tThis flag changes the way a merge commit is displayed\n> -\t(which means it is useful only when the command is given\n> -\tone <tree-ish>, or '--stdin').  It shows the differences\n> -\tfrom each of the parents to the merge result simultaneously\n> -\tinstead of showing pairwise diff between a parent and the\n> -\tresult one at a time (which is what the '-m' option does).\n> -\tFurthermore, it lists only files which were modified\n> -\tfrom all parents.\n> -\n>  --cc::\n>  \tThis flag changes the way a merge commit patch is displayed,\n>  \tin a similar way to the '-c' option. It implies the '-c'\n> @@ -99,9 +57,10 @@ include::pretty-options.txt[]\n>  \thunks disappear, the commit itself and the commit log\n>  \tmessage is not shown, just like in any other \"empty diff\" case.\n>  \n> ---always::\n> -\tShow the commit itself and the commit log message even\n> -\tif the diff itself is empty.\n> +include::diff-tree-options.txt[]\n> +\n> +\n> +include::pretty-options.txt[]\n>  \n>  \n>  include::pretty-formats.txt[]\n> -- \n> 1.5.5.1\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n\n----------------------------------------------------------------------\nFree pop3 email with a spam filter.\nhttp://www.bluebottle.com/tag/5\n"},{"id":"75287","messageId":"20080427114504.GT4012@genesis.frugalware.org","threadId":"13273","inReplyTo":"200804270730.m3R7UTTp011092@mi1.bluebottle.com","subject":"[PATCH] git show documentation: no longer refer to git-diff-tree options","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-04-27T11:45:04Z","receivedAt":"2008-04-27T11:45:04Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"The only git-diff-tree option that makes sense with git-show is '-s',\nbut (from a user's point of view) it has sightly different meaning,\nsince you don't have a --stdin option when using git-show.\n\nThis patch removes the reference to git-diff-tree options and adds\ndocumentation for '-s', in the context of git-show.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nOn Sun, Apr 27, 2008 at 04:29:55PM +0900, nanako3@bluebottle.com wrote:\n> I do not know if the updated patch is correct either.\n>\n> Did you try \"git show\" with the options you have in the new\n> \"tree-options\" file, for example \"git show --root HEAD\", and checked\n> to make sure they make sense?\n\nThe initial problem I tried to solve with this patch is to avoid the\nsituation, when you try to figure out what 'git show --foo' does and you\ncan't find that option in man git-show, which is a usability problem, I\nthink.\n\n> I think \"git show -s\" makes sense as it is easier to type than \"git\n> log -1\" but I do not think any other options you listed makes sense\n> with \"git show\".\n\nI just checked each option one by one and right, I haven't found any\nother option that could be useful for git-show either. Given that the\nwording of -s for git-show is quite different, I think it would be\neasier to just document -s in git-show as well. Like this?\n\nThanks.\n\n Documentation/git-show.txt |    9 +++------\n 1 files changed, 3 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\nindex dccf0e2..299b611 100644\n--- a/Documentation/git-show.txt\n+++ b/Documentation/git-show.txt\n@@ -25,12 +25,6 @@ with \\--name-only).\n \n For plain blobs, it shows the plain contents.\n \n-The command takes options applicable to the linkgit:git-diff-tree[1] command to\n-control how the changes the commit introduces are shown.\n-\n-This manual page describes only the most frequently used options.\n-\n-\n OPTIONS\n -------\n <object>::\n@@ -38,6 +32,9 @@ OPTIONS\n \tFor a more complete list of ways to spell object names, see\n \t\"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1].\n \n+-s::\n+\tDon't show a textural diff for commits.\n+\n include::pretty-options.txt[]\n \n \n-- \n1.5.5.1.91.g499fc.dirty\n"},{"id":"75310","messageId":"7v3ap7gq3d.fsf@gitster.siamese.dyndns.org","threadId":"13273","inReplyTo":"20080427114504.GT4012@genesis.frugalware.org","subject":"Re: [PATCH] git show documentation: no longer refer to git-diff-tree options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-04-27T17:33:26Z","receivedAt":"2008-04-27T17:33:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna <vmiklos@frugalware.org> writes:\n\n> I just checked each option one by one and right, I haven't found any\n> other option that could be useful for git-show either. Given that the\n> wording of -s for git-show is quite different, I think it would be\n> easier to just document -s in git-show as well. Like this?\n\nHmm, yes but not exactly.\n\nYou lost --stat, --name-only and friends that were implied by mentioning\n\"diff-tree\".\n\nI agree your _motivation_ behind your original patch is good.  Saying \"see\nalso that page if you want to do very exotic and rarely useful operation\"\nis one thing, but saying \"described are most often used ones\" and not\ndescribing enough is bad.\n\nPerhaps we would want to include diff-options.txt.  There may be some\noptions that are no-op or always-on in the context of \"git show\" in the\nfile, but we already have an infrastracture to turn parts of the inclusion\non and off depending on which manual page includes it.\n\n> diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\n> index dccf0e2..299b611 100644\n> --- a/Documentation/git-show.txt\n> +++ b/Documentation/git-show.txt\n> @@ -25,12 +25,6 @@ with \\--name-only).\n>  \n>  For plain blobs, it shows the plain contents.\n>  \n> -The command takes options applicable to the linkgit:git-diff-tree[1] command to\n> -control how the changes the commit introduces are shown.\n> -\n> -This manual page describes only the most frequently used options.\n> -\n> -\n>  OPTIONS\n>  -------\n>  <object>::\n> @@ -38,6 +32,9 @@ OPTIONS\n>  \tFor a more complete list of ways to spell object names, see\n>  \t\"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1].\n>  \n> +-s::\n> +\tDon't show a textural diff for commits.\n> +\n>  include::pretty-options.txt[]\n>  \n>  \n> -- \n> 1.5.5.1.91.g499fc.dirty\n"},{"id":"76665","messageId":"1210545443-12665-1-git-send-email-vmiklos@frugalware.org","threadId":"13273","inReplyTo":"7v3ap7gq3d.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] git show documentation: no longer refer to git-diff-tree options","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-11T22:37:23Z","receivedAt":"2008-05-11T22:37:23Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"The only git-diff-tree option that makes sense with git-show is '-s',\nbut (from a user's point of view) it has sightly different meaning,\nsince you don't have a --stdin option when using git-show.\n\nThis patch removes the reference to git-diff-tree options and adds\ndocumentation for '-s', in the context of git-show.\n\nIt also includes git-diff options, but excludes the ones which are not\nrelevant for this command.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nOn Sun, Apr 27, 2008 at 10:33:26AM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> Hmm, yes but not exactly.\n>\n> You lost --stat, --name-only and friends that were implied by\n> mentioning\n> \"diff-tree\".\n>\n> I agree your _motivation_ behind your original patch is good.  Saying\n> \"see\n> also that page if you want to do very exotic and rarely useful\n> operation\"\n> is one thing, but saying \"described are most often used ones\" and not\n> describing enough is bad.\n>\n> Perhaps we would want to include diff-options.txt.  There may be some\n> options that are no-op or always-on in the context of \"git show\" in\n> the\n> file, but we already have an infrastracture to turn parts of the\n> inclusion\n> on and off depending on which manual page includes it.\n\nThis patch implements this, I hope.\n\n(Sorry for the delay, BTW.)\n\n Documentation/diff-options.txt |   10 ++++++++++\n Documentation/git-show.txt     |   14 ++++++++------\n 2 files changed, 18 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 13234fa..af7846d 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -17,6 +17,7 @@ ifdef::git-format-patch[]\n \tGenerate patches without diffstat.\n endif::git-format-patch[]\n \n+ifndef::git-show[]\n ifndef::git-format-patch[]\n -p::\n \tGenerate patch (see section on generating patches).\n@@ -25,6 +26,7 @@ endif::git-format-patch[]\n \n -u::\n \tSynonym for \"-p\".\n+endif::git-show[]\n \n -U<n>::\n \tShorthand for \"--unified=<n>\".\n@@ -37,8 +39,10 @@ endif::git-format-patch[]\n \tGenerate the raw format.\n \t{git-diff-core? This is the default.}\n \n+ifndef::git-show[]\n --patch-with-raw::\n \tSynonym for \"-p --raw\".\n+endif::git-show[]\n \n --stat[=width[,name-width]]::\n \tGenerate a diffstat.  You can override the default\n@@ -70,6 +74,7 @@ endif::git-format-patch[]\n \tOutput a condensed summary of extended header information\n \tsuch as creations, renames and mode changes.\n \n+ifndef::git-show[]\n --patch-with-stat::\n \tSynonym for \"-p --stat\".\n \t{git-format-patch? This is the default.}\n@@ -78,6 +83,7 @@ endif::git-format-patch[]\n \tNUL-line termination on output.  This affects the --raw\n \toutput field terminator.  Also output from commands such\n \tas \"git-log\" will be delimited with NUL between commits.\n+endif::git-show[]\n \n --name-only::\n \tShow only names of changed files.\n@@ -159,6 +165,7 @@ endif::git-format-patch[]\n \tthe number of rename/copy targets exceeds the specified\n \tnumber.\n \n+ifndef::git-show[]\n -S<string>::\n \tLook for differences that contain the change in <string>.\n \n@@ -170,6 +177,7 @@ endif::git-format-patch[]\n --pickaxe-regex::\n \tMake the <string> not a plain string but an extended POSIX\n \tregex to match.\n+endif::git-show[]\n \n -O<orderfile>::\n \tOutput the patch in the order specified in the\n@@ -212,6 +220,7 @@ endif::git-format-patch[]\n -w::\n \tShorthand for \"--ignore-all-space\".\n \n+ifndef::git-show[]\n --exit-code::\n \tMake the program exit with codes similar to diff(1).\n \tThat is, it exits with 1 if there were differences and\n@@ -219,6 +228,7 @@ endif::git-format-patch[]\n \n --quiet::\n \tDisable all output of the program. Implies --exit-code.\n+endif::git-show[]\n \n --ext-diff::\n \tAllow an external diff helper to be executed. If you set an\ndiff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\nindex dccf0e2..6b5c3fb 100644\n--- a/Documentation/git-show.txt\n+++ b/Documentation/git-show.txt\n@@ -25,12 +25,6 @@ with \\--name-only).\n \n For plain blobs, it shows the plain contents.\n \n-The command takes options applicable to the linkgit:git-diff-tree[1] command to\n-control how the changes the commit introduces are shown.\n-\n-This manual page describes only the most frequently used options.\n-\n-\n OPTIONS\n -------\n <object>::\n@@ -38,6 +32,14 @@ OPTIONS\n \tFor a more complete list of ways to spell object names, see\n \t\"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1].\n \n+-s, --quiet::\n+\tDon't show a textural diff for commits.\n+\n+\n+:git-show: 1\n+include::diff-options.txt[]\n+\n+\n include::pretty-options.txt[]\n \n \n-- \n1.5.5.1\n"},{"id":"76807","messageId":"7vzlqvw23y.fsf@gitster.siamese.dyndns.org","threadId":"13273","inReplyTo":"1210545443-12665-1-git-send-email-vmiklos@frugalware.org","subject":"Re: [PATCH] git show documentation: no longer refer to git-diff-tree options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-12T23:10:09Z","receivedAt":"2008-05-12T23:10:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna <vmiklos@frugalware.org> writes:\n\n> This patch implements this, I hope.\n>\n> (Sorry for the delay, BTW.)\n\nNo problem.  Thanks.\n\n> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\n> index 13234fa..af7846d 100644\n> --- a/Documentation/diff-options.txt\n> +++ b/Documentation/diff-options.txt\n> @@ -17,6 +17,7 @@ ifdef::git-format-patch[]\n>  \tGenerate patches without diffstat.\n>  endif::git-format-patch[]\n\nHmm.  The symbol git-diff-core is defined for git-show and we say --raw is\nthe default for git-show because of it?\n\nHow about doing it this way instead?\n\n---\n Documentation/diff-options.txt |   22 +++++++++++++++++-----\n Documentation/git-show.txt     |   14 ++++++++------\n 2 files changed, 25 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 13234fa..a478612 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -7,21 +7,33 @@\n ifndef::git-format-patch[]\n ifndef::git-diff[]\n ifndef::git-log[]\n+ifndef::git-show[]\n :git-diff-core: 1\n+endif::git-show[]\n endif::git-log[]\n endif::git-diff[]\n endif::git-format-patch[]\n \n+ifdef::git-diff[]\n+:git-diff-p-is-default: 1\n+endif::git-diff[]\n+ifdef::git-show[]\n+:git-diff-p-is-default: 1\n+endif::git-show[]\n ifdef::git-format-patch[]\n+:git-diff-p-stat-is-default: 1\n+endif::git-format-patch[]\n+\n+ifdef::git-diff-p-stat-is-default[]\n -p::\n \tGenerate patches without diffstat.\n-endif::git-format-patch[]\n+endif::git-diff-p-stat-is-default[]\n \n-ifndef::git-format-patch[]\n+ifndef::git-diff-p-stat-is-default[]\n -p::\n \tGenerate patch (see section on generating patches).\n-\t{git-diff? This is the default.}\n-endif::git-format-patch[]\n+\t{git-diff-p-is-default? This is the default.}\n+endif::git-diff-p-stat-is-default[]\n \n -u::\n \tSynonym for \"-p\".\n@@ -72,7 +84,7 @@ endif::git-format-patch[]\n \n --patch-with-stat::\n \tSynonym for \"-p --stat\".\n-\t{git-format-patch? This is the default.}\n+\t{git-diff-p-stat-is-default? This is the default.}\n \n -z::\n \tNUL-line termination on output.  This affects the --raw\ndiff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\nindex dccf0e2..6b5c3fb 100644\n--- a/Documentation/git-show.txt\n+++ b/Documentation/git-show.txt\n@@ -25,12 +25,6 @@ with \\--name-only).\n \n For plain blobs, it shows the plain contents.\n \n-The command takes options applicable to the linkgit:git-diff-tree[1] command to\n-control how the changes the commit introduces are shown.\n-\n-This manual page describes only the most frequently used options.\n-\n-\n OPTIONS\n -------\n <object>::\n@@ -38,6 +32,14 @@ OPTIONS\n \tFor a more complete list of ways to spell object names, see\n \t\"SPECIFYING REVISIONS\" section in linkgit:git-rev-parse[1].\n \n+-s, --quiet::\n+\tDon't show a textural diff for commits.\n+\n+\n+:git-show: 1\n+include::diff-options.txt[]\n+\n+\n include::pretty-options.txt[]\n \n \n"},{"id":"76849","messageId":"20080513091126.GZ27724@genesis.frugalware.org","threadId":"13273","inReplyTo":"7vzlqvw23y.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] git show documentation: no longer refer to git-diff-tree options","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-13T09:11:26Z","receivedAt":"2008-05-13T09:11:26Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, May 12, 2008 at 04:10:09PM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> Hmm.  The symbol git-diff-core is defined for git-show and we say --raw is\n> the default for git-show because of it?\n\nOuch, somehow I read infdef: as ifdef: so I intenionally did not add\ngit-show, but it was a mistake.\n\n> How about doing it this way instead?\n\nSure, I like the idea of introducing the git-diff-p-stat-is-default\ndefine.\n"},{"id":"76852","messageId":"20080513091618.GA27724@genesis.frugalware.org","threadId":"13273","inReplyTo":"20080513091126.GZ27724@genesis.frugalware.org","subject":"Re: [PATCH] git show documentation: no longer refer to git-diff-tree options","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-13T09:16:18Z","receivedAt":"2008-05-13T09:16:18Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Tue, May 13, 2008 at 11:11:26AM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:\n> Ouch, somehow I read infdef: as ifdef: so I intenionally did not add\n\n                       ^^^^^^ ifndef, to be correct.\n"}]}