{"thread":{"id":"60096","subject":"[PATCH] Fix grammar in git push man page","startedAt":"2023-08-10T00:41:23Z","lastAt":"2023-08-10T01:45:58Z","messageCount":5,"participants":["Wesley Schwengle","Junio C Hamano","Bagas Sanjaya"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"480416","messageId":"20230810004044.1420385-1-wesleys@opperschaap.net","threadId":"60096","inReplyTo":null,"subject":"[PATCH] Fix grammar in git push man page","fromName":"Wesley Schwengle","fromEmail":"wesleys@opperschaap.net","sentAt":"2023-08-10T00:40:25Z","receivedAt":"2023-08-10T00:41:23Z","isPatch":true,"sender":{"key":"wesleys@opperschaap.net","avatar":"https://avatars.githubusercontent.com/u/6317502?v=4"},"body":"While working on a blog post and using grammarly it suggested these two\nchanges.\n\nSigned-off-by: Wesley Schwengle \n---\n Documentation/git-push.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 297927d866..6926e79719 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -37,7 +37,7 @@ the default `` by consulting `remote.*.push` configuration,\n and if it is not found, honors `push.default` configuration to decide\n what to push (See linkgit:git-config[1] for the meaning of `push.default`).\n \n-When neither the command-line nor the configuration specify what to\n+When neither the command line nor the configuration specifies what to\n push, the default behavior is used, which corresponds to the `simple`\n value for `push.default`: the current branch is pushed to the\n corresponding upstream branch, but as a safety measure, the push is\n-- \n2.42.0.rc0.26.ga73c38ecaa\n\n"},{"id":"480422","messageId":"xmqqcyzvk8cn.fsf@gitster.g","threadId":"60096","inReplyTo":"20230810004044.1420385-1-wesleys@opperschaap.net","subject":"Re: [PATCH] Fix grammar in git push man page","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-08-10T01:13:28Z","receivedAt":"2023-08-10T01:13:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Wesley Schwengle writes:\n\n> Subject: Re: [PATCH] Fix grammar in git push man page\n\nWe would probably phrase it more like\n\n\tSubject: git-push.txt: fix grammar\n\n> While working on a blog post and using grammarly it suggested these two\n> changes.\n>\n> Signed-off-by: Wesley Schwengle \n> ---\n> Documentation/git-push.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\n> index 297927d866..6926e79719 100644\n> --- a/Documentation/git-push.txt\n> +++ b/Documentation/git-push.txt\n> @@ -37,7 +37,7 @@ the default `` by consulting `remote.*.push` configuration,\n> and if it is not found, honors `push.default` configuration to decide\n> what to push (See linkgit:git-config[1] for the meaning of `push.default`).\n> \n> -When neither the command-line nor the configuration specify what to\n> +When neither the command line nor the configuration specifies what to\n\nThe fix for the verb is very much correct and appreciated.\n\nThe first part is debatable for two reasons.\n\nLocally, what is \"fixed\" is only one of the two instances of\n\"command-line\" in this file. If we were to clean it up, you would\nat least want to do the other one for consistency.\n\nGlobally, git grep -i \"command.line\" in Documentation (excluding\nDocumentation/RelNotes, as that part is almost exclusively written\nby me and shows my bias) gives ~200 hits for \"command line\" and ~100\nhits for \"command-line\". We pretty much use them inter-changeably,\nin other words.\n\nBut for the grammar fix, it probably makes sense to just fix the\nverb without touching \"command-line\"; you have ~100 other instances\nthat want to be touched for consistency, and they shouldn't take the\nverb fix hostage.\n\nThanks.\n\n> push, the default behavior is used, which corresponds to the `simple`\n> value for `push.default`: the current branch is pushed to the\n> corresponding upstream branch, but as a safety measure, the push is\n"},{"id":"480424","messageId":"20230810012105.1423462-1-wesleys@opperschaap.net","threadId":"60096","inReplyTo":"xmqqcyzvk8cn.fsf@gitster.g","subject":"[[PATCH v2]] git-push.txt: fix grammar","fromName":"Wesley Schwengle","fromEmail":"wesleys@opperschaap.net","sentAt":"2023-08-10T01:21:05Z","receivedAt":"2023-08-10T01:21:19Z","isPatch":true,"sender":{"key":"wesleys@opperschaap.net","avatar":"https://avatars.githubusercontent.com/u/6317502?v=4"},"body":"While working on a blog post and using grammarly it suggested this\nchange.\n\nSigned-off-by: Wesley Schwengle \n---\n Documentation/git-push.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 297927d866..5b4edaf4a8 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -37,7 +37,7 @@ the default `` by consulting `remote.*.push` configuration,\n and if it is not found, honors `push.default` configuration to decide\n what to push (See linkgit:git-config[1] for the meaning of `push.default`).\n \n-When neither the command-line nor the configuration specify what to\n+When neither the command-line nor the configuration specifies what to\n push, the default behavior is used, which corresponds to the `simple`\n value for `push.default`: the current branch is pushed to the\n corresponding upstream branch, but as a safety measure, the push is\n-- \n2.42.0.rc0.26.ga73c38ecaa\n\n"},{"id":"480425","messageId":"ZNRANBdZG9kAnjxq@debian.me","threadId":"60096","inReplyTo":"20230810004044.1420385-1-wesleys@opperschaap.net","subject":"Re: [PATCH] Fix grammar in git push man page","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2023-08-10T01:41:08Z","receivedAt":"2023-08-10T01:41:39Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On Wed, Aug 09, 2023 at 08:40:25PM -0400, Wesley Schwengle wrote:\n> -When neither the command-line nor the configuration specify what to\n> +When neither the command line nor the configuration specifies what to\n\nIMO either command-line or command line is correct...\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"},{"id":"480426","messageId":"f6ef3689-820a-f85c-68a7-9c87a5eabe27@gmail.com","threadId":"60096","inReplyTo":"ZNRANBdZG9kAnjxq@debian.me","subject":"Re: [PATCH] Fix grammar in git push man page","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2023-08-10T01:45:29Z","receivedAt":"2023-08-10T01:45:58Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 10/08/2023 08:41, Bagas Sanjaya wrote:\n> On Wed, Aug 09, 2023 at 08:40:25PM -0400, Wesley Schwengle wrote:\n>> -When neither the command-line nor the configuration specify what to\n>> +When neither the command line nor the configuration specifies what to\n> \n> IMO either command-line or command line is correct...\n> \n\nOops, I mean both forms (with and without dash) are correct.\n\n-- \nAn old man doll... just what I always wanted! - Clara\n\n"}]}