{"thread":{"id":"26686","subject":"--max-count useless with git-rev-list's --reverse","startedAt":"2011-03-07T19:17:38Z","lastAt":"2011-03-10T07:50:07Z","messageCount":14,"participants":["Ævar Arnfjörð Bjarmason","Shawn Pearce","Jay Soffian","Michael J Gruber","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"162931","messageId":"AANLkTikpK-r_kdqCEPwpqEgENtwgUrZDLwZnuS2QMdH=@mail.gmail.com","threadId":"26686","inReplyTo":null,"subject":"--max-count useless with git-rev-list's --reverse","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2011-03-07T19:17:38Z","receivedAt":"2011-03-07T19:17:38Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On git.git, this works as expected, gives me the first 3 commits:\n\n   $ git rev-list --reverse origin/master | head -n 3\n    e83c5163316f89bfbde7d9ab23ca2e25604af290\n    8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68\n    e497ea2a9b6c378f01d092c210af20cbee762475\n\nWhy is this so useless about ignoring the --reverse option, is this my\ndesign (these are the 3 *latest* commits):\n\n    $ git rev-list --reverse origin/master --max-count=3\n    08fd8710e277eed73a21c6c5483c57bfeb14e8a7\n    6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b\n    07873dc5dd67398324278ff0d7627bb1a863ba89\n    $ git rev-list origin/master --max-count=3\n    07873dc5dd67398324278ff0d7627bb1a863ba89\n    6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b\n    08fd8710e277eed73a21c6c5483c57bfeb14e8a7\n\n>From the manpage:\n\n   --reverse\n       Output the commits in reverse order. Cannot be combined with\n--walk-reflogs.\n\nShouldn't --reverse be applied *before* --max-count?\n"},{"id":"162933","messageId":"AANLkTikTQfxK8B3fN6y5UZ=tRaM_iWXcfq=ukK4vPq2R@mail.gmail.com","threadId":"26686","inReplyTo":"AANLkTikpK-r_kdqCEPwpqEgENtwgUrZDLwZnuS2QMdH=@mail.gmail.com","subject":"Re: --max-count useless with git-rev-list's --reverse","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2011-03-07T19:40:21Z","receivedAt":"2011-03-07T19:40:21Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"On Mon, Mar 7, 2011 at 11:17, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n> From the manpage:\n>\n>   --reverse\n>       Output the commits in reverse order. Cannot be combined with\n> --walk-reflogs.\n>\n> Shouldn't --reverse be applied *before* --max-count?\n\nNo. Its applied after, otherwise things like \"git log -n 5 --reverse\"\nwouldn't let me review the last 5 commits in chronological order. It\nalso would take a long time to find the first 5 commits in a project\nthe size of linux-2.6. Most users don't care about the first 5 commits\nof a project, but they do care about the most recent X commits that\nmay have occurred.\n\nSo yes, sometimes the reverse doesn't occur where you want it, but its\nso rare to want the first X commits of a project's history that its\njust accepted. In theory we could add a\n--reverse-from-beginning-of-time flag to do what you want, but I don't\nthink anyone has cared enough to implement this. Most users who want\nthe beginning of time are OK with something like `git show $(git\nrev-list --all | tail -1)`.\n\n-- \nShawn.\n"},{"id":"162964","messageId":"AANLkTin19c8jP9D2iQbP8XVLo4O_4+Wf+exwB-inCBQV@mail.gmail.com","threadId":"26686","inReplyTo":"AANLkTikTQfxK8B3fN6y5UZ=tRaM_iWXcfq=ukK4vPq2R@mail.gmail.com","subject":"Re: --max-count useless with git-rev-list's --reverse","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2011-03-08T07:35:22Z","receivedAt":"2011-03-08T07:35:22Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Mon, Mar 7, 2011 at 2:40 PM, Shawn Pearce <spearce@spearce.org> wrote:\n> On Mon, Mar 7, 2011 at 11:17, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n>> From the manpage:\n>\n> No. Its applied after, otherwise things like \"git log -n 5 --reverse\"\n\nI think I was surprised the first time I tried to combine those\noptions as well, but in retrospect the reason is obvious. Nonetheless,\nI think this has come up on the list a few time, so... Ævar, would you\nmind submitting a documentation patch?\n\nj.\n"},{"id":"162969","messageId":"4D75E92C.1090506@drmicha.warpmail.net","threadId":"26686","inReplyTo":"AANLkTikpK-r_kdqCEPwpqEgENtwgUrZDLwZnuS2QMdH=@mail.gmail.com","subject":"Re: --max-count useless with git-rev-list's --reverse","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-08T08:30:36Z","receivedAt":"2011-03-08T08:30:36Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Ævar Arnfjörð Bjarmason venit, vidit, dixit 07.03.2011 20:17:\n> On git.git, this works as expected, gives me the first 3 commits:\n> \n>    $ git rev-list --reverse origin/master | head -n 3\n>     e83c5163316f89bfbde7d9ab23ca2e25604af290\n>     8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68\n>     e497ea2a9b6c378f01d092c210af20cbee762475\n> \n> Why is this so useless about ignoring the --reverse option, is this my\n> design (these are the 3 *latest* commits):\n\nI don't think it's your design ;)\n\n> \n>     $ git rev-list --reverse origin/master --max-count=3\n>     08fd8710e277eed73a21c6c5483c57bfeb14e8a7\n>     6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b\n>     07873dc5dd67398324278ff0d7627bb1a863ba89\n>     $ git rev-list origin/master --max-count=3\n>     07873dc5dd67398324278ff0d7627bb1a863ba89\n>     6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b\n>     08fd8710e277eed73a21c6c5483c57bfeb14e8a7\n> \n> From the manpage:\n> \n>    --reverse\n>        Output the commits in reverse order. Cannot be combined with\n\nAnd that's exactly what it does - built in \"tac\", so to say.\n\n> --walk-reflogs.\n> \n> Shouldn't --reverse be applied *before* --max-count?\n\nWe could be clearer about the order in which these options are applied,\nfor example by listing the option blocks in that order and pointing out\n--reverse in particular, see the upcoming little (squashable series).\n\nCheers,\nMichael\n"},{"id":"162971","messageId":"2862dfc9969beb42636ec44292d3509ddb215285.1299572814.git.git@drmicha.warpmail.net","threadId":"26686","inReplyTo":"4D75E92C.1090506@drmicha.warpmail.net","subject":"[PATCH 1/3] rev-list-options.txt: typo fix","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-08T08:31:24Z","receivedAt":"2011-03-08T08:31:24Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n Documentation/rev-list-options.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 95d209c..76add13 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -165,7 +165,7 @@ limiting may be applied.\n -n 'number'::\n --max-count=<number>::\n \n-\tLimit the number of commits output.\n+\tLimit the number of commits to output.\n \n --skip=<number>::\n \n-- \n1.7.4.1.299.g567d7.dirty\n"},{"id":"162970","messageId":"4c0ad5a9af1d18e59a7e820349a531f220cbf776.1299572814.git.git@drmicha.warpmail.net","threadId":"26686","inReplyTo":"4D75E92C.1090506@drmicha.warpmail.net","subject":"[PATCH 2/3] git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-08T08:31:25Z","receivedAt":"2011-03-08T08:31:25Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"and therefore applied after commit ordering and formatting options, in\nparticular --reverse. Say so.\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n Documentation/git-log.txt          |    1 +\n Documentation/rev-list-options.txt |    3 ++-\n 2 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex ff41784..48c1715 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -25,6 +25,7 @@ OPTIONS\n \n -<n>::\n \tLimits the number of commits to show.\n+\tNote that this is a commit limiting option, see below.\n \n <since>..<until>::\n \tShow only commits between the named two commits.  When\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 76add13..adcafa0 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -158,7 +158,8 @@ Commit Limiting\n \n Besides specifying a range of commits that should be listed using the\n special notations explained in the description, additional commit\n-limiting may be applied.\n+limiting may be applied. Note that they are applied before commit\n+ordering and formatting options, such as '--reverse'.\n \n --\n \n-- \n1.7.4.1.299.g567d7.dirty\n"},{"id":"162972","messageId":"f34ebc6211ead3fa6698ff9b7a92903723715a28.1299572814.git.git@drmicha.warpmail.net","threadId":"26686","inReplyTo":"4D75E92C.1090506@drmicha.warpmail.net","subject":"[PATCH 3/3] git-log.txt,rev-list-options.txt: put option blocks in proper order","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-08T08:31:26Z","receivedAt":"2011-03-08T08:31:26Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"which is the order in which they get applied:\n\ncommit limiting\ncommit ordering\ncommit formatting\ndiff options\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n Documentation/git-log.txt          |    4 +-\n Documentation/rev-list-options.txt |  310 ++++++++++++++++++------------------\n 2 files changed, 157 insertions(+), 157 deletions(-)\n\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 48c1715..6ae57dc 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -77,12 +77,12 @@ Common diff options\n ~~~~~~~~~~~~~~~~~~~\n \n :git-log: 1\n-include::diff-options.txt[]\n-\n include::rev-list-options.txt[]\n \n include::pretty-formats.txt[]\n \n+include::diff-options.txt[]\n+\n include::diff-generate-patch.txt[]\n \n Examples\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex adcafa0..f5a426b 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -1,158 +1,3 @@\n-Commit Formatting\n-~~~~~~~~~~~~~~~~~\n-\n-ifdef::git-rev-list[]\n-Using these options, linkgit:git-rev-list[1] will act similar to the\n-more specialized family of commit log tools: linkgit:git-log[1],\n-linkgit:git-show[1], and linkgit:git-whatchanged[1]\n-endif::git-rev-list[]\n-\n-include::pretty-options.txt[]\n-\n---relative-date::\n-\n-\tSynonym for `--date=relative`.\n-\n---date=(relative|local|default|iso|rfc|short|raw)::\n-\n-\tOnly takes effect for dates shown in human-readable format, such\n-\tas when using \"--pretty\". `log.date` config variable sets a default\n-\tvalue for log command's --date option.\n-+\n-`--date=relative` shows dates relative to the current time,\n-e.g. \"2 hours ago\".\n-+\n-`--date=local` shows timestamps in user's local timezone.\n-+\n-`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.\n-+\n-`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822\n-format, often found in E-mail messages.\n-+\n-`--date=short` shows only date but not time, in `YYYY-MM-DD` format.\n-+\n-`--date=raw` shows the date in the internal raw git format `%s %z` format.\n-+\n-`--date=default` shows timestamps in the original timezone\n-(either committer's or author's).\n-\n-ifdef::git-rev-list[]\n---header::\n-\n-\tPrint the contents of the commit in raw-format; each record is\n-\tseparated with a NUL character.\n-endif::git-rev-list[]\n-\n---parents::\n-\n-\tPrint also the parents of the commit (in the form \"commit parent...\").\n-\tAlso enables parent rewriting, see 'History Simplification' below.\n-\n---children::\n-\n-\tPrint also the children of the commit (in the form \"commit child...\").\n-\tAlso enables parent rewriting, see 'History Simplification' below.\n-\n-ifdef::git-rev-list[]\n---timestamp::\n-\tPrint the raw commit timestamp.\n-endif::git-rev-list[]\n-\n---left-right::\n-\n-\tMark which side of a symmetric diff a commit is reachable from.\n-\tCommits from the left side are prefixed with `<` and those from\n-\tthe right with `>`.  If combined with `--boundary`, those\n-\tcommits are prefixed with `-`.\n-+\n-For example, if you have this topology:\n-+\n------------------------------------------------------------------------\n-             y---b---b  branch B\n-            / \\ /\n-           /   .\n-          /   / \\\n-         o---x---a---a  branch A\n------------------------------------------------------------------------\n-+\n-you would get an output like this:\n-+\n------------------------------------------------------------------------\n-\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n-\n-\t>bbbbbbb... 3rd on b\n-\t>bbbbbbb... 2nd on b\n-\t<aaaaaaa... 3rd on a\n-\t<aaaaaaa... 2nd on a\n-\t-yyyyyyy... 1st on b\n-\t-xxxxxxx... 1st on a\n------------------------------------------------------------------------\n-\n---graph::\n-\n-\tDraw a text-based graphical representation of the commit history\n-\ton the left hand side of the output.  This may cause extra lines\n-\tto be printed in between commits, in order for the graph history\n-\tto be drawn properly.\n-+\n-This enables parent rewriting, see 'History Simplification' below.\n-+\n-This implies the '--topo-order' option by default, but the\n-'--date-order' option may also be specified.\n-\n-ifdef::git-rev-list[]\n---count::\n-\tPrint a number stating how many commits would have been\n-\tlisted, and suppress all other output.  When used together\n-\twith '--left-right', instead print the counts for left and\n-\tright commits, separated by a tab.\n-endif::git-rev-list[]\n-\n-\n-ifndef::git-rev-list[]\n-Diff Formatting\n-~~~~~~~~~~~~~~~\n-\n-Below are listed options that control the formatting of diff output.\n-Some of them are specific to linkgit:git-rev-list[1], however other diff\n-options may be given. See linkgit:git-diff-files[1] for more options.\n-\n--c::\n-\n-\tWith this option, diff output for a merge commit\n-\tshows the differences from each of the parents to the merge result\n-\tsimultaneously instead of showing pairwise diff between a parent\n-\tand the result one at a time. Furthermore, it lists only files\n-\twhich were modified from all parents.\n-\n---cc::\n-\n-\tThis flag implies the '-c' options and further compresses the\n-\tpatch output by omitting uninteresting hunks whose contents in\n-\tthe parents have only two variants and the merge result picks\n-\tone of them without modification.\n-\n--m::\n-\n-\tThis flag makes the merge commits show the full diff like\n-\tregular commits; for each merge parent, a separate log entry\n-\tand diff is generated. An exception is that only diff against\n-\tthe first parent is shown when '--first-parent' option is given;\n-\tin that case, the output represents the changes the merge\n-\tbrought _into_ the then-current branch.\n-\n--r::\n-\n-\tShow recursive diffs.\n-\n--t::\n-\n-\tShow the tree objects in the diff output. This implies '-r'.\n-\n--s::\n-\tSuppress diff output.\n-endif::git-rev-list[]\n-\n Commit Limiting\n ~~~~~~~~~~~~~~~\n \n@@ -762,3 +607,158 @@ These options are mostly targeted for packing of git repositories.\n --do-walk::\n \n \tOverrides a previous --no-walk.\n+\n+Commit Formatting\n+~~~~~~~~~~~~~~~~~\n+\n+ifdef::git-rev-list[]\n+Using these options, linkgit:git-rev-list[1] will act similar to the\n+more specialized family of commit log tools: linkgit:git-log[1],\n+linkgit:git-show[1], and linkgit:git-whatchanged[1]\n+endif::git-rev-list[]\n+\n+include::pretty-options.txt[]\n+\n+--relative-date::\n+\n+\tSynonym for `--date=relative`.\n+\n+--date=(relative|local|default|iso|rfc|short|raw)::\n+\n+\tOnly takes effect for dates shown in human-readable format, such\n+\tas when using \"--pretty\". `log.date` config variable sets a default\n+\tvalue for log command's --date option.\n++\n+`--date=relative` shows dates relative to the current time,\n+e.g. \"2 hours ago\".\n++\n+`--date=local` shows timestamps in user's local timezone.\n++\n+`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.\n++\n+`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822\n+format, often found in E-mail messages.\n++\n+`--date=short` shows only date but not time, in `YYYY-MM-DD` format.\n++\n+`--date=raw` shows the date in the internal raw git format `%s %z` format.\n++\n+`--date=default` shows timestamps in the original timezone\n+(either committer's or author's).\n+\n+ifdef::git-rev-list[]\n+--header::\n+\n+\tPrint the contents of the commit in raw-format; each record is\n+\tseparated with a NUL character.\n+endif::git-rev-list[]\n+\n+--parents::\n+\n+\tPrint also the parents of the commit (in the form \"commit parent...\").\n+\tAlso enables parent rewriting, see 'History Simplification' below.\n+\n+--children::\n+\n+\tPrint also the children of the commit (in the form \"commit child...\").\n+\tAlso enables parent rewriting, see 'History Simplification' below.\n+\n+ifdef::git-rev-list[]\n+--timestamp::\n+\tPrint the raw commit timestamp.\n+endif::git-rev-list[]\n+\n+--left-right::\n+\n+\tMark which side of a symmetric diff a commit is reachable from.\n+\tCommits from the left side are prefixed with `<` and those from\n+\tthe right with `>`.  If combined with `--boundary`, those\n+\tcommits are prefixed with `-`.\n++\n+For example, if you have this topology:\n++\n+-----------------------------------------------------------------------\n+             y---b---b  branch B\n+            / \\ /\n+           /   .\n+          /   / \\\n+         o---x---a---a  branch A\n+-----------------------------------------------------------------------\n++\n+you would get an output like this:\n++\n+-----------------------------------------------------------------------\n+\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n+\n+\t>bbbbbbb... 3rd on b\n+\t>bbbbbbb... 2nd on b\n+\t<aaaaaaa... 3rd on a\n+\t<aaaaaaa... 2nd on a\n+\t-yyyyyyy... 1st on b\n+\t-xxxxxxx... 1st on a\n+-----------------------------------------------------------------------\n+\n+--graph::\n+\n+\tDraw a text-based graphical representation of the commit history\n+\ton the left hand side of the output.  This may cause extra lines\n+\tto be printed in between commits, in order for the graph history\n+\tto be drawn properly.\n++\n+This enables parent rewriting, see 'History Simplification' below.\n++\n+This implies the '--topo-order' option by default, but the\n+'--date-order' option may also be specified.\n+\n+ifdef::git-rev-list[]\n+--count::\n+\tPrint a number stating how many commits would have been\n+\tlisted, and suppress all other output.  When used together\n+\twith '--left-right', instead print the counts for left and\n+\tright commits, separated by a tab.\n+endif::git-rev-list[]\n+\n+\n+ifndef::git-rev-list[]\n+Diff Formatting\n+~~~~~~~~~~~~~~~\n+\n+Below are listed options that control the formatting of diff output.\n+Some of them are specific to linkgit:git-rev-list[1], however other diff\n+options may be given. See linkgit:git-diff-files[1] for more options.\n+\n+-c::\n+\n+\tWith this option, diff output for a merge commit\n+\tshows the differences from each of the parents to the merge result\n+\tsimultaneously instead of showing pairwise diff between a parent\n+\tand the result one at a time. Furthermore, it lists only files\n+\twhich were modified from all parents.\n+\n+--cc::\n+\n+\tThis flag implies the '-c' options and further compresses the\n+\tpatch output by omitting uninteresting hunks whose contents in\n+\tthe parents have only two variants and the merge result picks\n+\tone of them without modification.\n+\n+-m::\n+\n+\tThis flag makes the merge commits show the full diff like\n+\tregular commits; for each merge parent, a separate log entry\n+\tand diff is generated. An exception is that only diff against\n+\tthe first parent is shown when '--first-parent' option is given;\n+\tin that case, the output represents the changes the merge\n+\tbrought _into_ the then-current branch.\n+\n+-r::\n+\n+\tShow recursive diffs.\n+\n+-t::\n+\n+\tShow the tree objects in the diff output. This implies '-r'.\n+\n+-s::\n+\tSuppress diff output.\n+endif::git-rev-list[]\n-- \n1.7.4.1.299.g567d7.dirty\n"},{"id":"162973","messageId":"4D75EA2C.9010200@drmicha.warpmail.net","threadId":"26686","inReplyTo":"AANLkTin19c8jP9D2iQbP8XVLo4O_4+Wf+exwB-inCBQV@mail.gmail.com","subject":"Re: --max-count useless with git-rev-list's --reverse","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-08T08:34:52Z","receivedAt":"2011-03-08T08:34:52Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jay Soffian venit, vidit, dixit 08.03.2011 08:35:\n> On Mon, Mar 7, 2011 at 2:40 PM, Shawn Pearce <spearce@spearce.org> wrote:\n>> On Mon, Mar 7, 2011 at 11:17, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n>>> From the manpage:\n>>\n>> No. Its applied after, otherwise things like \"git log -n 5 --reverse\"\n> \n> I think I was surprised the first time I tried to combine those\n> options as well, but in retrospect the reason is obvious. Nonetheless,\n> I think this has come up on the list a few time, so... Ævar, would you\n> mind submitting a documentation patch?\n\nDue to gmane lag, I replied to AAB's post only, but I bet you'll find\nthe patches.\n\nCheers,\nMichael\n"},{"id":"163009","messageId":"7vei6he68j.fsf@alter.siamese.dyndns.org","threadId":"26686","inReplyTo":"2862dfc9969beb42636ec44292d3509ddb215285.1299572814.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 1/3] rev-list-options.txt: typo fix","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-08T19:56:28Z","receivedAt":"2011-03-08T19:56:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber <git@drmicha.warpmail.net> writes:\n\n> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n> ---\n>  Documentation/rev-list-options.txt |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\n> index 95d209c..76add13 100644\n> --- a/Documentation/rev-list-options.txt\n> +++ b/Documentation/rev-list-options.txt\n> @@ -165,7 +165,7 @@ limiting may be applied.\n>  -n 'number'::\n>  --max-count=<number>::\n>  \n> -\tLimit the number of commits output.\n> +\tLimit the number of commits to output.\n>  \n>  --skip=<number>::\n\nIIRC, the original was written using \"output\" as past particle of verb\n\"output\" (as \"output\" in \"the commits are output\"), so strictly speaking I\ndon't think it is a typo.\n\nBut I like the new text better, so will apply ;-).\n"},{"id":"163010","messageId":"7vaah5e63p.fsf@alter.siamese.dyndns.org","threadId":"26686","inReplyTo":"4c0ad5a9af1d18e59a7e820349a531f220cbf776.1299572814.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 2/3] git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-08T19:59:22Z","receivedAt":"2011-03-08T19:59:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber <git@drmicha.warpmail.net> writes:\n\n> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n> index ff41784..48c1715 100644\n> --- a/Documentation/git-log.txt\n> +++ b/Documentation/git-log.txt\n> @@ -25,6 +25,7 @@ OPTIONS\n>  \n>  -<n>::\n>  \tLimits the number of commits to show.\n> +\tNote that this is a commit limiting option, see below.\n\nI wonder if we should be dropping this instead, as it appears later in the\ndocument anyway.\n\n> diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\n> index 76add13..adcafa0 100644\n> --- a/Documentation/rev-list-options.txt\n> +++ b/Documentation/rev-list-options.txt\n> @@ -158,7 +158,8 @@ Commit Limiting\n>  \n>  Besides specifying a range of commits that should be listed using the\n>  special notations explained in the description, additional commit\n> -limiting may be applied.\n> +limiting may be applied. Note that they are applied before commit\n> +ordering and formatting options, such as '--reverse'.\n\nThis part is probably a good addition.\n"},{"id":"163046","messageId":"4D77273F.8040105@drmicha.warpmail.net","threadId":"26686","inReplyTo":"7vei6he68j.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/3] rev-list-options.txt: typo fix","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-09T07:07:43Z","receivedAt":"2011-03-09T07:07:43Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 08.03.2011 20:56:\n> Michael J Gruber <git@drmicha.warpmail.net> writes:\n> \n>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n>> ---\n>>  Documentation/rev-list-options.txt |    2 +-\n>>  1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\n>> index 95d209c..76add13 100644\n>> --- a/Documentation/rev-list-options.txt\n>> +++ b/Documentation/rev-list-options.txt\n>> @@ -165,7 +165,7 @@ limiting may be applied.\n>>  -n 'number'::\n>>  --max-count=<number>::\n>>  \n>> -\tLimit the number of commits output.\n>> +\tLimit the number of commits to output.\n>>  \n>>  --skip=<number>::\n> \n> IIRC, the original was written using \"output\" as past particle of verb\n> \"output\" (as \"output\" in \"the commits are output\"), so strictly speaking I\n> don't think it is a typo.\n\nWhen I switch on my \"latin mode\" I can recognize the participle in that\nposition, but only then ;)\n\n> \n> But I like the new text better, so will apply ;-).\n> \n\nWith s/typo/grammo/ ;-)\n"},{"id":"163047","messageId":"4D77281E.5020803@drmicha.warpmail.net","threadId":"26686","inReplyTo":"7vaah5e63p.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 2/3] git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-09T07:11:26Z","receivedAt":"2011-03-09T07:11:26Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 08.03.2011 20:59:\n> Michael J Gruber <git@drmicha.warpmail.net> writes:\n> \n>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n>> index ff41784..48c1715 100644\n>> --- a/Documentation/git-log.txt\n>> +++ b/Documentation/git-log.txt\n>> @@ -25,6 +25,7 @@ OPTIONS\n>>  \n>>  -<n>::\n>>  \tLimits the number of commits to show.\n>> +\tNote that this is a commit limiting option, see below.\n> \n> I wonder if we should be dropping this instead, as it appears later in the\n> document anyway.\n\nIt is an intended redundancy but can be dropped, of course. I just\nthought that people confused by \"-<n>\" would not be looking further down\nfor yet another description of the same option unless they are pointed\nto it (or the right section) explicitly.\n\nMichael\n"},{"id":"163099","messageId":"7vbp1j985v.fsf@alter.siamese.dyndns.org","threadId":"26686","inReplyTo":"f34ebc6211ead3fa6698ff9b7a92903723715a28.1299572814.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 3/3] git-log.txt,rev-list-options.txt: put option blocks in proper order","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-09T23:38:20Z","receivedAt":"2011-03-09T23:38:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber <git@drmicha.warpmail.net> writes:\n\n> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n> index 48c1715..6ae57dc 100644\n> --- a/Documentation/git-log.txt\n> +++ b/Documentation/git-log.txt\n> @@ -77,12 +77,12 @@ Common diff options\n>  ~~~~~~~~~~~~~~~~~~~\n>  \n>  :git-log: 1\n> -include::diff-options.txt[]\n> -\n>  include::rev-list-options.txt[]\n>  \n>  include::pretty-formats.txt[]\n>  \n> +include::diff-options.txt[]\n> +\n>  include::diff-generate-patch.txt[]\n\nThis is wrong.  The title \"Common diff options\", telling the AsciiDoc that\nwe are formatting for git-log manual page with \":git-log: 1\" and inclusion\nof diff-options.txt form a single group.  With your patch, the \"Common\ndiff options\" section will become ampty and makes AsciiDoc barf.\n\nYou would need _at least_ something like the attached patch on top, which\nfor now I'll squash in.\n\n Documentation/git-log.txt |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 6ae57dc..c43aa43 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -73,14 +73,14 @@ produced by --stat etc.\n \tto be prefixed with \"\\-- \" to separate them from options or\n \trefnames.\n \n-Common diff options\n-~~~~~~~~~~~~~~~~~~~\n-\n-:git-log: 1\n include::rev-list-options.txt[]\n \n include::pretty-formats.txt[]\n \n+Common diff options\n+-------------------\n+\n+:git-log: 1\n include::diff-options.txt[]\n \n include::diff-generate-patch.txt[]\n"},{"id":"163116","messageId":"4D7882AF.4010705@drmicha.warpmail.net","threadId":"26686","inReplyTo":"7vbp1j985v.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 3/3] git-log.txt,rev-list-options.txt: put option blocks in proper order","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-10T07:50:07Z","receivedAt":"2011-03-10T07:50:07Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 10.03.2011 00:38:\n> Michael J Gruber <git@drmicha.warpmail.net> writes:\n> \n>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n>> index 48c1715..6ae57dc 100644\n>> --- a/Documentation/git-log.txt\n>> +++ b/Documentation/git-log.txt\n>> @@ -77,12 +77,12 @@ Common diff options\n>>  ~~~~~~~~~~~~~~~~~~~\n>>  \n>>  :git-log: 1\n>> -include::diff-options.txt[]\n>> -\n>>  include::rev-list-options.txt[]\n>>  \n>>  include::pretty-formats.txt[]\n>>  \n>> +include::diff-options.txt[]\n>> +\n>>  include::diff-generate-patch.txt[]\n> \n> This is wrong.  The title \"Common diff options\", telling the AsciiDoc that\n> we are formatting for git-log manual page with \":git-log: 1\" and inclusion\n> of diff-options.txt form a single group.  With your patch, the \"Common\n> diff options\" section will become ampty and makes AsciiDoc barf.\n> \n> You would need _at least_ something like the attached patch on top, which\n> for now I'll squash in.\n\nDidn't I say \"squashable series\"? ;)\n\nSeriously, I'm sorry for this blunder. I usually build Doc before\nsubmitting Doc patches (and here more careful reading should have sufficed).\n\n>  Documentation/git-log.txt |    8 ++++----\n>  1 files changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n> index 6ae57dc..c43aa43 100644\n> --- a/Documentation/git-log.txt\n> +++ b/Documentation/git-log.txt\n> @@ -73,14 +73,14 @@ produced by --stat etc.\n>  \tto be prefixed with \"\\-- \" to separate them from options or\n>  \trefnames.\n>  \n> -Common diff options\n> -~~~~~~~~~~~~~~~~~~~\n> -\n> -:git-log: 1\n>  include::rev-list-options.txt[]\n>  \n>  include::pretty-formats.txt[]\n>  \n> +Common diff options\n> +-------------------\n> +\n> +:git-log: 1\n>  include::diff-options.txt[]\n>  \n>  include::diff-generate-patch.txt[]\n\nThanks, that's what I meant, and I also meant to mark 3/3 as PATCH/RFC\nbecause it's a larger change in the Doc for a main command.\n\nMichael\n"}]}