{"thread":{"id":"21316","subject":"[PATCH] Documentation/fetch-options.txt: order options alphabetically","startedAt":"2009-10-21T20:07:49Z","lastAt":"2009-10-22T14:14:57Z","messageCount":7,"participants":["Jari Aalto","Junio C Hamano","Nanako Shiraishi","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"125638","messageId":"87eiow1pey.fsf@jondo.cante.net","threadId":"21316","inReplyTo":null,"subject":"[PATCH] Documentation/fetch-options.txt: order options alphabetically","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-10-21T20:07:49Z","receivedAt":"2009-10-21T20:07:49Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Signed-off-by: Jari Aalto \n---\n Documentation/fetch-options.txt | 48 +++++++++++++++++++-------------------\n 1 files changed, 24 insertions(+), 24 deletions(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 5eb2b0e..2886874 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -1,25 +1,13 @@\n-ifndef::git-pull[]\n--q::\n---quiet::\n-\tPass --quiet to git-fetch-pack and silence any other internally\n-\tused git commands.\n-\n--v::\n---verbose::\n-\tBe verbose.\n-endif::git-pull[]\n-\n -a::\n --append::\n \tAppend ref names and object names of fetched refs to the\n \texisting contents of `.git/FETCH_HEAD`. Without this\n \toption old data in `.git/FETCH_HEAD` will be overwritten.\n \n---upload-pack ::\n-\tWhen given, and the repository to fetch from is handled\n-\tby 'git-fetch-pack', '--exec=' is passed to\n-\tthe command to specify non-default path for the command\n-\trun on the other end.\n+--depth=::\n+\tDeepen the history of a 'shallow' repository created by\n+\t`git clone` with `--depth=` option (see linkgit:git-clone[1])\n+\tby the specified number of commits.\n \n -f::\n --force::\n@@ -29,6 +17,10 @@ endif::git-pull[]\n \tfetches is a descendant of ``. This option\n \toverrides that check.\n \n+-k::\n+--keep::\n+\tKeep downloaded pack.\n+\n ifdef::git-pull[]\n --no-tags::\n endif::git-pull[]\n@@ -49,10 +41,6 @@ endif::git-pull[]\n \tflag lets all tags and their associated objects be\n \tdownloaded.\n \n--k::\n---keep::\n-\tKeep downloaded pack.\n-\n -u::\n --update-head-ok::\n \tBy default 'git-fetch' refuses to update the head which\n@@ -62,7 +50,19 @@ endif::git-pull[]\n \timplementing your own Porcelain you are not supposed to\n \tuse it.\n \n---depth=::\n-\tDeepen the history of a 'shallow' repository created by\n-\t`git clone` with `--depth=` option (see linkgit:git-clone[1])\n-\tby the specified number of commits.\n+--upload-pack ::\n+\tWhen given, and the repository to fetch from is handled\n+\tby 'git-fetch-pack', '--exec=' is passed to\n+\tthe command to specify non-default path for the command\n+\trun on the other end.\n+\n+ifndef::git-pull[]\n+-q::\n+--quiet::\n+\tPass --quiet to git-fetch-pack and silence any other internally\n+\tused git commands.\n+\n+-v::\n+--verbose::\n+\tBe verbose.\n+endif::git-pull[]\n-- \n1.6.4.3\n"},{"id":"125642","messageId":"7vpr8g32ht.fsf@alter.siamese.dyndns.org","threadId":"21316","inReplyTo":"87eiow1pey.fsf@jondo.cante.net","subject":"Re: [PATCH] Documentation/fetch-options.txt: order options alphabetically","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-21T20:39:58Z","receivedAt":"2009-10-21T20:39:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jari Aalto writes:\n\n> Signed-off-by: Jari Aalto \n> ---\n> Documentation/fetch-options.txt | 48 +++++++++++++++++++-------------------\n> 1 files changed, 24 insertions(+), 24 deletions(-)\n\nDoes this even make sense when git-pull.txt itself includes files other\nthan this one? fetch-options.txt may begin with the description of -a\nthat is very early in the alphabetical sequence, but git-pull.txt includes\nmerge-options.txt before this file, whose contents would describe what\nprobably would come after -a (I didn't check). Also git-pull.txt itself\nhas description of --rebase and --no-rebase that definitely come before -a\n(I did check).\n"},{"id":"125643","messageId":"7vhbts3285.fsf@alter.siamese.dyndns.org","threadId":"21316","inReplyTo":"7vpr8g32ht.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/fetch-options.txt: order options alphabetically","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-21T20:45:46Z","receivedAt":"2009-10-21T20:45:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Jari Aalto writes:\n>\n>> Signed-off-by: Jari Aalto \n>> ---\n>> Documentation/fetch-options.txt | 48 +++++++++++++++++++-------------------\n>> 1 files changed, 24 insertions(+), 24 deletions(-)\n>\n> Does this even make sense when git-pull.txt itself includes files other\n> than this one? fetch-options.txt may begin with the description of -a\n> that is very early in the alphabetical sequence, but git-pull.txt includes\n> merge-options.txt before this file, whose contents would describe what\n> probably would come after -a (I didn't check). Also git-pull.txt itself\n> has description of --rebase and --no-rebase that definitely come before -a\n> (I did check).\n\nAh, in your defense ;-) I think you looked only at git-fetch.txt without\nchecking where else this file is included. Then the patch certainly is\nunderstandable. It would probably make git-fetch.{1,html} easier to scan,\nwhile making things not worse for git-pull.{1,html}\n"},{"id":"125693","messageId":"87my3jzss3.fsf@jondo.cante.net","threadId":"21316","inReplyTo":"7vhbts3285.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/fetch-options.txt: order options alphabetically","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-10-22T09:23:24Z","receivedAt":"2009-10-22T09:23:24Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Junio C Hamano writes:\n> I think you looked only at git-fetch.txt without\n> checking where else this file is included. Then the patch certainly is\n> understandable. It would probably make git-fetch.{1,html} easier to scan,\n> while making things not worse for git-pull.{1,html}\n\nYes. Unfortunately there doesn't seem to be a way to arrange all nicely,\nso perhaps you could accept the following patch to accompany with it. At\nleast there would be ordered \"git-fetch\" and semi ordered \"git-pull\".\n\n Subject: [PATCH] Documentation/merge-options.txt: order options in alphabetical groups\n\nJari\n"},{"id":"125698","messageId":"20091022192152.6117@nanako3.lavabit.com","threadId":"21316","inReplyTo":"7vhbts3285.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/fetch-options.txt: order options alphabetically","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-10-22T10:21:52Z","receivedAt":"2009-10-22T10:21:52Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Junio C Hamano \n\n> Ah, in your defense ;-) I think you looked only at git-fetch.txt without\n> checking where else this file is included. Then the patch certainly is\n> understandable. It would probably make git-fetch.{1,html} easier to scan,\n> while making things not worse for git-pull.{1,html}\n\nCan't we introduce subsections in the OPTIONS section to \ngroup them together, like this (sorry, not a patch)?\n\nOPTIONS\n-------\n\nOptions related to merging <---- added\n~~~~~~~~~~~~~~~~~~~~~~~~~~ <---- added\ninclude::merge-options.txt[]\n\n:git-pull: 1\n\n--rebase::\n\tInstead of a merge, perform a rebase after fetching. If\n\tthere is a remote ref for the upstream branch, and this branch\n\twas rebased since last fetched, the rebase uses that information\n\tto avoid rebasing non-local changes. To make this the default\n\tfor branch ``, set configuration `branch..rebase`\n\tto `true`.\n+\n[NOTE]\nThis is a potentially _dangerous_ mode of operation.\nIt rewrites history, which does not bode well when you\npublished that history already. Do *not* use this option\nunless you have read linkgit:git-rebase[1] carefully.\n\n--no-rebase::\n\tOverride earlier --rebase.\n\nOptions related to fetching <---- added\n~~~~~~~~~~~~~~~~~~~~~~~~~~~ <---- added\ninclude::fetch-options.txt[]\n\ninclude::pull-fetch-param.txt[]\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"125700","messageId":"20091022112526.GA7005@coredump.intra.peff.net","threadId":"21316","inReplyTo":"20091022192152.6117@nanako3.lavabit.com","subject":"Re: [PATCH] Documentation/fetch-options.txt: order options alphabetically","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-10-22T11:25:26Z","receivedAt":"2009-10-22T11:25:26Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Oct 22, 2009 at 07:21:52PM +0900, Nanako Shiraishi wrote:\n\n> > Ah, in your defense ;-) I think you looked only at git-fetch.txt without\n> > checking where else this file is included. Then the patch certainly is\n> > understandable. It would probably make git-fetch.{1,html} easier to scan,\n> > while making things not worse for git-pull.{1,html}\n> \n> Can't we introduce subsections in the OPTIONS section to \n> group them together, like this (sorry, not a patch)?\n\nYes, that was my first thought when reading this thread, too (sorry, no\npatch here, either. I need to sleep and then get on a plane).\n\n-Peff\n"},{"id":"125701","messageId":"87y6n3y0pq.fsf_-_@jondo.cante.net","threadId":"21316","inReplyTo":"20091022192152.6117@nanako3.lavabit.com","subject":"[PATCH] Documentation/git-pull.txt: Add subtitles above included option files","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2009-10-22T14:14:57Z","receivedAt":"2009-10-22T14:14:57Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Signed-off-by: Jari Aalto \n---\n Documentation/git-pull.txt | 7 +++++++\n 1 files changed, 7 insertions(+), 0 deletions(-)\n\n Nanako Shiraishi writes:\n\n > Quoting Junio C Hamano \n >\n >> Ah, in your defense ;-) I think you looked only at git-fetch.txt without\n >> checking where else this file is included. Then the patch certainly is\n >> understandable. It would probably make git-fetch.{1,html} easier to scan,\n >> while making things not worse for git-pull.{1,html}\n >\n > Can't we introduce subsections in the OPTIONS section to \n > group them together, like this (sorry, not a patch)?\n >\n > OPTIONS\n > -------\n >\n > Options related to merging <---- added\n > ~~~~~~~~~~~~~~~~~~~~~~~~~~ <---- added\n > include::merge-options.txt[]\n\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 7578623..51534dd 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -26,6 +26,10 @@ Also note that options meant for 'git-pull' itself and underlying\n \n OPTIONS\n -------\n+\n+Options related to merging\n+~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n include::merge-options.txt[]\n \n :git-pull: 1\n@@ -47,6 +51,9 @@ unless you have read linkgit:git-rebase[1] carefully.\n --no-rebase::\n \tOverride earlier --rebase.\n \n+Options related to fetching\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n include::fetch-options.txt[]\n \n include::pull-fetch-param.txt[]\n-- \n1.6.4.3\n"}]}