{"thread":{"id":"66850","subject":"[PATCH 1/1] doc/gitcli: minor fixes","startedAt":"2026-11-14T20:15:44Z","lastAt":"2026-11-21T06:42:21Z","messageCount":6,"participants":["Dirk Gouders","Junio C Hamano","Andy Koppe"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"558484","messageId":"20261114201632.103400-1-dirk@gouders.net","threadId":"66850","inReplyTo":null,"subject":"[PATCH 1/1] doc/gitcli: minor fixes","fromName":"Dirk Gouders","fromEmail":"dirk@gouders.net","sentAt":"2026-11-14T20:15:44Z","receivedAt":"2026-11-14T20:15:44Z","isPatch":true,"sender":{"key":"dirk@gouders.net","avatar":"https://avatars.githubusercontent.com/u/81326422?v=4"},"body":"Fix three details in the gitcli documentation:\n\nUse plural where appropriate and imperative form when rules are\nlisted.\n\nSigned-off-by: Dirk Gouders <dirk@gouders.net>\n---\n Documentation/gitcli.adoc | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/gitcli.adoc b/Documentation/gitcli.adoc\nindex 9c4598e29c..6b0a58938a 100644\n--- a/Documentation/gitcli.adoc\n+++ b/Documentation/gitcli.adoc\n@@ -8,7 +8,7 @@ gitcli - Git command-line interface and conventions\n DESCRIPTION\n -----------\n \n-This manual describes the convention used throughout Git CLI.\n+This manual describes the conventions used throughout Git CLI.\n \n Many commands take revisions (most often \"commits\", but sometimes\n \"tree-ish\", depending on the context and command) and paths as their\n@@ -28,7 +28,7 @@ arguments.  Here are the rules:\n    `v1.0` and `v2.0` are revisions and `arch/x86` and `include/asm-x86`\n    are paths.\n \n- * When an argument can be misunderstood as either a revision or a path,\n+ * When arguments can be misunderstood as either a revision or a path,\n    they can be disambiguated by placing `--` between them.\n    E.g. `git diff -- HEAD` is, \"I have a file called HEAD in my work\n    tree.  Please show changes between the version I staged in the index\n@@ -76,8 +76,8 @@ you will.\n Here are the rules regarding the \"flags\" that you should follow when you are\n scripting Git:\n \n- * Splitting short options to separate words (prefer `git foo -a -b`\n-   to `git foo -ab`, the latter may not even work).\n+ * Split short options to separate words: prefer `git foo -a -b`\n+   to `git foo -ab` (the latter may not even work).\n \n  * When a command-line option takes an argument, use the 'stuck' form.  In\n    other words, write `git foo -oArg` instead of `git foo -o Arg` for short\n-- \n2.55.0\n\n\n"},{"id":"558487","messageId":"xmqqik1znkn8.fsf@gitster.g","threadId":"66850","inReplyTo":"20261114201632.103400-1-dirk@gouders.net","subject":"Re: [PATCH 1/1] doc/gitcli: minor fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-11-14T21:55:07Z","receivedAt":"2026-11-14T21:55:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Dirk Gouders <dirk@gouders.net> writes:\n\n> -This manual describes the convention used throughout Git CLI.\n> +This manual describes the conventions used throughout Git CLI.\n\nOK.\n\n> @@ -28,7 +28,7 @@ arguments.  Here are the rules:\n>     `v1.0` and `v2.0` are revisions and `arch/x86` and `include/asm-x86`\n>     are paths.\n>  \n> - * When an argument can be misunderstood as either a revision or a path,\n> + * When arguments can be misunderstood as either a revision or a path,\n>     they can be disambiguated by placing `--` between them.\n\nI would rather have left the subject as-is, and then rewrote the\nconclusion part to \"it can be disambiguated by placing `--` before\nor arter it\".  Once you start talking about multiple arguments, you\nwould have to also reorder them so that all revs come first, then\n'--', and then all paths. \n\n> @@ -76,8 +76,8 @@ you will.\n>  Here are the rules regarding the \"flags\" that you should follow when you are\n>  scripting Git:\n>  \n> - * Splitting short options to separate words (prefer `git foo -a -b`\n> -   to `git foo -ab`, the latter may not even work).\n> + * Split short options to separate words: prefer `git foo -a -b`\n> +   to `git foo -ab` (the latter may not even work).\n\nOK.\n\nThanks.\n\n"},{"id":"558488","messageId":"ghik1z6p6c.fsf@gouders.net","threadId":"66850","inReplyTo":"xmqqik1znkn8.fsf@gitster.g","subject":"Re: [PATCH 1/1] doc/gitcli: minor fixes","fromName":"Dirk Gouders","fromEmail":"dirk@gouders.net","sentAt":"2026-11-14T22:09:15Z","receivedAt":"2026-11-14T22:09:15Z","isPatch":true,"sender":{"key":"dirk@gouders.net","avatar":"https://avatars.githubusercontent.com/u/81326422?v=4"},"body":"On Sat, Nov 14 2026, Junio C Hamano wrote:\n\n> Dirk Gouders <dirk@gouders.net> writes:\n>\n>> -This manual describes the convention used throughout Git CLI.\n>> +This manual describes the conventions used throughout Git CLI.\n>\n> OK.\n>\n>> @@ -28,7 +28,7 @@ arguments.  Here are the rules:\n>>     `v1.0` and `v2.0` are revisions and `arch/x86` and `include/asm-x86`\n>>     are paths.\n>>  \n>> - * When an argument can be misunderstood as either a revision or a path,\n>> + * When arguments can be misunderstood as either a revision or a path,\n>>     they can be disambiguated by placing `--` between them.\n>\n> I would rather have left the subject as-is, and then rewrote the\n> conclusion part to \"it can be disambiguated by placing `--` before\n> or arter it\".  Once you start talking about multiple arguments, you\n> would have to also reorder them so that all revs come first, then\n> '--', and then all paths. \n\nThank you for the quick review.\n\nYes, there were two possible fixes for this second detail.\nI will send a v2 according to your suggestion.\n\nRegards,\n\nDirk\n\n>> @@ -76,8 +76,8 @@ you will.\n>>  Here are the rules regarding the \"flags\" that you should follow when you are\n>>  scripting Git:\n>>  \n>> - * Splitting short options to separate words (prefer `git foo -a -b`\n>> -   to `git foo -ab`, the latter may not even work).\n>> + * Split short options to separate words: prefer `git foo -a -b`\n>> +   to `git foo -ab` (the latter may not even work).\n>\n> OK.\n>\n> Thanks.\n\n"},{"id":"558489","messageId":"20261114222411.105592-1-dirk@gouders.net","threadId":"66850","inReplyTo":"20261114201632.103400-1-dirk@gouders.net","subject":"[PATCH v2] doc/gitcli: minor fixes","fromName":"Dirk Gouders","fromEmail":"dirk@gouders.net","sentAt":"2026-11-14T22:23:37Z","receivedAt":"2026-11-14T22:23:37Z","isPatch":true,"sender":{"key":"dirk@gouders.net","avatar":"https://avatars.githubusercontent.com/u/81326422?v=4"},"body":"Fix three details in the gitcli documentation:\n\nUse plural/singular where appropriate and imperative form when rules\nare listed.\n\nSigned-off-by: Dirk Gouders <dirk@gouders.net>\n---\n Documentation/gitcli.adoc | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/gitcli.adoc b/Documentation/gitcli.adoc\nindex 9c4598e29c..454c482a50 100644\n--- a/Documentation/gitcli.adoc\n+++ b/Documentation/gitcli.adoc\n@@ -8,7 +8,7 @@ gitcli - Git command-line interface and conventions\n DESCRIPTION\n -----------\n \n-This manual describes the convention used throughout Git CLI.\n+This manual describes the conventions used throughout Git CLI.\n \n Many commands take revisions (most often \"commits\", but sometimes\n \"tree-ish\", depending on the context and command) and paths as their\n@@ -29,7 +29,7 @@ arguments.  Here are the rules:\n    are paths.\n \n  * When an argument can be misunderstood as either a revision or a path,\n-   they can be disambiguated by placing `--` between them.\n+   it can be disambiguated by placing `--` before or after it.\n    E.g. `git diff -- HEAD` is, \"I have a file called HEAD in my work\n    tree.  Please show changes between the version I staged in the index\n    and what I have in the work tree for that file\", not \"show the difference\n@@ -76,8 +76,8 @@ you will.\n Here are the rules regarding the \"flags\" that you should follow when you are\n scripting Git:\n \n- * Splitting short options to separate words (prefer `git foo -a -b`\n-   to `git foo -ab`, the latter may not even work).\n+ * Split short options to separate words: prefer `git foo -a -b`\n+   to `git foo -ab` (the latter may not even work).\n \n  * When a command-line option takes an argument, use the 'stuck' form.  In\n    other words, write `git foo -oArg` instead of `git foo -o Arg` for short\n-- \n2.55.0\n\n\n"},{"id":"558492","messageId":"20261115070357.113875-1-dirk@gouders.net","threadId":"66850","inReplyTo":"20261114201632.103400-1-dirk@gouders.net","subject":"[PATCH v3] doc/gitcli: minor fixes","fromName":"Dirk Gouders","fromEmail":"dirk@gouders.net","sentAt":"2026-11-15T07:03:37Z","receivedAt":"2026-11-15T07:03:37Z","isPatch":true,"sender":{"key":"dirk@gouders.net","avatar":"https://avatars.githubusercontent.com/u/81326422?v=4"},"body":"Fix three details in the gitcli documentation:\n\nUse plural/singular where appropriate and imperative form when rules\nare listed.\n\nSigned-off-by: Dirk Gouders <dirk@gouders.net>\n---\nPlease disregard v2, I forgot to Cc the reviewer and to add the range-diff.\n\nChanges in v3:\n- Resent with proper Cc and range-diff against v1.\n\nChanges in v2:\n- Addressed feedback on the second part of the change.\n\n Documentation/gitcli.adoc | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/gitcli.adoc b/Documentation/gitcli.adoc\nindex 9c4598e29c..454c482a50 100644\n--- a/Documentation/gitcli.adoc\n+++ b/Documentation/gitcli.adoc\n@@ -8,7 +8,7 @@ gitcli - Git command-line interface and conventions\n DESCRIPTION\n -----------\n \n-This manual describes the convention used throughout Git CLI.\n+This manual describes the conventions used throughout Git CLI.\n \n Many commands take revisions (most often \"commits\", but sometimes\n \"tree-ish\", depending on the context and command) and paths as their\n@@ -29,7 +29,7 @@ arguments.  Here are the rules:\n    are paths.\n \n  * When an argument can be misunderstood as either a revision or a path,\n-   they can be disambiguated by placing `--` between them.\n+   it can be disambiguated by placing `--` before or after it.\n    E.g. `git diff -- HEAD` is, \"I have a file called HEAD in my work\n    tree.  Please show changes between the version I staged in the index\n    and what I have in the work tree for that file\", not \"show the difference\n@@ -76,8 +76,8 @@ you will.\n Here are the rules regarding the \"flags\" that you should follow when you are\n scripting Git:\n \n- * Splitting short options to separate words (prefer `git foo -a -b`\n-   to `git foo -ab`, the latter may not even work).\n+ * Split short options to separate words: prefer `git foo -a -b`\n+   to `git foo -ab` (the latter may not even work).\n \n  * When a command-line option takes an argument, use the 'stuck' form.  In\n    other words, write `git foo -oArg` instead of `git foo -o Arg` for short\n\nRange-diff against v1:\n1:  1393397087 ! 1:  7f44bbde6b doc/gitcli: minor fixes\n    @@ Commit message\n     \n         Fix three details in the gitcli documentation:\n     \n    -    Use plural where appropriate and imperative form when rules are\n    -    listed.\n    +    Use plural/singular where appropriate and imperative form when rules\n    +    are listed.\n     \n         Signed-off-by: Dirk Gouders <dirk@gouders.net>\n     \n    @@ Documentation/gitcli.adoc: gitcli - Git command-line interface and conventions\n      Many commands take revisions (most often \"commits\", but sometimes\n      \"tree-ish\", depending on the context and command) and paths as their\n     @@ Documentation/gitcli.adoc: arguments.  Here are the rules:\n    -    `v1.0` and `v2.0` are revisions and `arch/x86` and `include/asm-x86`\n         are paths.\n      \n    -- * When an argument can be misunderstood as either a revision or a path,\n    -+ * When arguments can be misunderstood as either a revision or a path,\n    -    they can be disambiguated by placing `--` between them.\n    +  * When an argument can be misunderstood as either a revision or a path,\n    +-   they can be disambiguated by placing `--` between them.\n    ++   it can be disambiguated by placing `--` before or after it.\n         E.g. `git diff -- HEAD` is, \"I have a file called HEAD in my work\n         tree.  Please show changes between the version I staged in the index\n    +    and what I have in the work tree for that file\", not \"show the difference\n     @@ Documentation/gitcli.adoc: you will.\n      Here are the rules regarding the \"flags\" that you should follow when you are\n      scripting Git:\n-- \n2.55.0\n\n\n"},{"id":"559020","messageId":"CAHWeT-ZvrBXJTJWuLNsw3S_Do-NCF_MxVf80mWbbuoKtxdF_7Q@mail.gmail.com","threadId":"66850","inReplyTo":"20261115070357.113875-1-dirk@gouders.net","subject":"Re: [PATCH v3] doc/gitcli: minor fixes","fromName":"Andy Koppe","fromEmail":"andy.koppe@gmail.com","sentAt":"2026-11-21T06:42:21Z","receivedAt":"2026-11-21T06:42:21Z","isPatch":true,"sender":{"key":"andy.koppe@gmail.com","avatar":"https://avatars.githubusercontent.com/u/223411?v=4"},"body":"On 15 Nov 2026, Dirk Gouders wrote:\n> Fix three details in the gitcli documentation:\n>\n> Use plural/singular where appropriate and imperative form when rules\n> are listed.\n\nThe introduction promises a list of three, but only as single point\nfollows. The message should mention the change to the '--' rule.\n\n> - * Splitting short options to separate words (prefer `git foo -a -b`\n> -   to `git foo -ab`, the latter may not even work).\n> + * Split short options to separate words: prefer `git foo -a -b`\n> +   to `git foo -ab` (the latter may not even work).\n\nNit: \"into separate words\" reads more naturally, although \"to\" was\nalready there before.\n\n"}]}