{"thread":{"id":"16951","subject":"[PATCH] Documentation/git-merge: at least one <remote> not two","startedAt":"2009-01-01T18:41:08Z","lastAt":"2009-01-02T00:25:34Z","messageCount":3,"participants":["jidanni@jidanni.org","Junio C Hamano","Sitaram Chamarty"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"99094","messageId":"87d4f6vph7.fsf@jidanni.org","threadId":"16951","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge: at least one <remote> not two","fromName":"","fromEmail":"jidanni@jidanni.org","sentAt":"2009-01-01T18:41:08Z","receivedAt":"2009-01-01T18:41:08Z","isPatch":true,"sender":{"key":"jidanni@jidanni.org","avatar":"https://gravatar.com/avatar/36568d4af4c8d3e71627ef3b8c8d00e39065b12f29676cccd38ced75e68fa2a6?d=mp&s=160"},"body":"Make SYNOPSIS match usage message\n\nSigned-off-by: jidanni <jidanni@jidanni.org>\n---\n Documentation/git-merge.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex f7be584..a3ac828 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -10,7 +10,7 @@ SYNOPSIS\n --------\n [verse]\n 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...\n-\t[-m <msg>] <remote> <remote>...\n+\t[-m <msg>] <remote>...\n 'git merge' <msg> HEAD <remote>...\n \n DESCRIPTION\n-- \n1.6.0.6\n"},{"id":"99114","messageId":"7vk59ehg7l.fsf@gitster.siamese.dyndns.org","threadId":"16951","inReplyTo":"87d4f6vph7.fsf@jidanni.org","subject":"Re: [PATCH] Documentation/git-merge: at least one <remote> not two","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-01-01T21:25:02Z","receivedAt":"2009-01-01T21:25:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"jidanni@jidanni.org writes:\n\n> Make SYNOPSIS match usage message\n>\n> Signed-off-by: jidanni <jidanni@jidanni.org>\n> ---\n>  Documentation/git-merge.txt |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> index f7be584..a3ac828 100644\n> --- a/Documentation/git-merge.txt\n> +++ b/Documentation/git-merge.txt\n> @@ -10,7 +10,7 @@ SYNOPSIS\n>  --------\n>  [verse]\n>  'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...\n> -\t[-m <msg>] <remote> <remote>...\n> +\t[-m <msg>] <remote>...\n>  'git merge' <msg> HEAD <remote>...\n\nThe original uses ellipses for the first-class UI syntax as \"zero or\nmore\", while it means \"one or more\" in the description for the original\nsyntax, which is inconsistent, and you are matching them by making both\nuse \"one or more\" interpretation.\n\nTwo issues:\n\n * Are there similar breakages like this in the documentation and the\n   usage text?  It would be a good idea to make the ellipses to mean the\n   same thing everywhere, and a janitorial patch series that would fix\n   the \"ellipses\" breakage (and nothing else) may be a good thing to\n   have.  But before going that route...\n\n * Is it a good idea to standardize on \"one or more\" semantics?  I suspect\n   we would rather want to standardize on \"zero or more\", because it would\n   be more natural to say:\n\n    $ git diff [--] <paths>...\n\n   to mean \"You can give paths if you want to but you do not have to\".  If\n   ellipses meant \"one or more\", you have to say this instead:\n\n    $ git diff [--] [<paths>...]\n\nWhile I prefer \"zero or more\" because  I think it is more logical, if the\npreparatory study for the first issue reveals that we use \"one or more\" a\nlot more often, it might be easier to standardize on that interpretation.\n\nOh, you also need to give ellipses to the usage string for the original\nsyntax in builtin-merge.c to match SYNOPSIS and usage string.\n\nThanks.\n"},{"id":"99135","messageId":"slrnglqnnu.tht.sitaramc@sitaramc.homelinux.net","threadId":"16951","inReplyTo":"7vk59ehg7l.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Documentation/git-merge: at least one <remote> not two","fromName":"Sitaram Chamarty","fromEmail":"sitaramc@gmail.com","sentAt":"2009-01-02T00:25:34Z","receivedAt":"2009-01-02T00:25:34Z","isPatch":true,"sender":{"key":"sitaramc@gmail.com","avatar":"https://avatars.githubusercontent.com/u/43316?v=4"},"body":"On 2009-01-01, Junio C Hamano <gitster@pobox.com> wrote:\n>  * Is it a good idea to standardize on \"one or more\" semantics?  I suspect\n>    we would rather want to standardize on \"zero or more\", because it would\n>    be more natural to say:\n>\n>     $ git diff [--] <paths>...\n>\n>    to mean \"You can give paths if you want to but you do not have to\".  If\n>    ellipses meant \"one or more\", you have to say this instead:\n>\n>     $ git diff [--] [<paths>...]\n\nFor what it is worth, I have always understood \"...\" to mean\n\"more of the preceding\", meaning \"one or more\".  That is\nyour first example above.\n\nZero or more is your second syntax above, because the whole\nthing is in brackets, and hence completely optional.\n\nIn regex terms (to me anyway):\n\na?      ==  [a]\na+      ==  a...\na*      ==  [a...]\n"}]}