{"thread":{"id":"18542","subject":"[PATCH] Grammar fixes to \"merge\" and \"patch-id\" docs","startedAt":"2009-03-25T18:23:42Z","lastAt":"2009-03-26T09:39:04Z","messageCount":5,"participants":["Wincent Colaiuta","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"109389","messageId":"1238005422-7647-1-git-send-email-win@wincent.com","threadId":"18542","inReplyTo":null,"subject":"[PATCH] Grammar fixes to \"merge\" and \"patch-id\" docs","fromName":"Wincent Colaiuta","fromEmail":"win@wincent.com","sentAt":"2009-03-25T18:23:42Z","receivedAt":"2009-03-25T18:23:42Z","isPatch":true,"sender":{"key":"greg@hurrell.net","avatar":"https://avatars.githubusercontent.com/u/7074?v=4"},"body":"Signed-off-by: Wincent Colaiuta \n---\nJust a few grammar glitches that caught my eye while\nperusing some man pages.\n\n Documentation/git-merge.txt | 2 +-\n Documentation/git-patch-id.txt | 2 +-\n Documentation/merge-strategies.txt | 14 +++++++-------\n 3 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex cc0d30f..427ad90 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -41,7 +41,7 @@ include::merge-strategies.txt[]\n \n \n If you tried a merge which resulted in a complex conflicts and\n-would want to start over, you can recover with 'git-reset'.\n+want to start over, you can recover with 'git-reset'.\n \n CONFIGURATION\n -------------\ndiff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt\nindex 477785e..253fc0f 100644\n--- a/Documentation/git-patch-id.txt\n+++ b/Documentation/git-patch-id.txt\n@@ -20,7 +20,7 @@ IOW, you can use this thing to look for likely duplicate commits.\n \n When dealing with 'git-diff-tree' output, it takes advantage of\n the fact that the patch is prefixed with the object name of the\n-commit, and outputs two 40-byte hexadecimal string. The first\n+commit, and outputs two 40-byte hexadecimal strings. The first\n string is the patch ID, and the second string is the commit ID.\n This can be used to make a mapping from patch ID to commit ID.\n \ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex 1276f85..ee7f754 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -3,15 +3,15 @@ MERGE STRATEGIES\n \n resolve::\n \tThis can only resolve two heads (i.e. the current branch\n-\tand another branch you pulled from) using 3-way merge\n+\tand another branch you pulled from) using a 3-way merge\n \talgorithm. It tries to carefully detect criss-cross\n \tmerge ambiguities and is considered generally safe and\n \tfast.\n \n recursive::\n-\tThis can only resolve two heads using 3-way merge\n-\talgorithm. When there are more than one common\n-\tancestors that can be used for 3-way merge, it creates a\n+\tThis can only resolve two heads using a 3-way merge\n+\talgorithm. When there is more than one common\n+\tancestor that can be used for 3-way merge, it creates a\n \tmerged tree of the common ancestors and uses that as\n \tthe reference tree for the 3-way merge. This has been\n \treported to result in fewer merge conflicts without\n@@ -22,11 +22,11 @@ recursive::\n \tpulling or merging one branch.\n \n octopus::\n-\tThis resolves more than two-head case, but refuses to do\n-\tcomplex merge that needs manual resolution. It is\n+\tThis resolves the more than two-heads case, but refuses to do\n+\ta complex merge that needs manual resolution. It is\n \tprimarily meant to be used for bundling topic branch\n \theads together. This is the default merge strategy when\n-\tpulling or merging more than one branches.\n+\tpulling or merging more than one branch.\n \n ours::\n \tThis resolves any number of heads, but the result of the\n-- \n1.6.2.1\n"},{"id":"109393","messageId":"7vocvp310v.fsf@gitster.siamese.dyndns.org","threadId":"18542","inReplyTo":"1238005422-7647-1-git-send-email-win@wincent.com","subject":"Re: [PATCH] Grammar fixes to \"merge\" and \"patch-id\" docs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-25T18:33:52Z","receivedAt":"2009-03-25T18:33:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Wincent Colaiuta writes:\n\n> If you tried a merge which resulted in a complex conflicts and\n> -would want to start over, you can recover with 'git-reset'.\n> +want to start over, you can recover with 'git-reset'.\n\nReads Ok to me either way...\n\n> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\n> index 1276f85..ee7f754 100644\n> --- a/Documentation/merge-strategies.txt\n> +++ b/Documentation/merge-strategies.txt\n> @@ -3,15 +3,15 @@ MERGE STRATEGIES\n> \n> resolve::\n> \tThis can only resolve two heads (i.e. the current branch\n> -\tand another branch you pulled from) using 3-way merge\n> +\tand another branch you pulled from) using a 3-way merge\n> \talgorithm. It tries to carefully detect criss-cross\n\nHmph, would that be an 'a' or 'the'?\n\n> recursive::\n> -\tThis can only resolve two heads using 3-way merge\n> -\talgorithm. When there are more than one common\n> -\tancestors that can be used for 3-way merge, it creates a\n> +\tThis can only resolve two heads using a 3-way merge\n> +\talgorithm. When there is more than one common\n> +\tancestor that can be used for 3-way merge, it creates a\n\nDo you need an article before the latter \"3-way merge\", perhaps \"the\"?\n\n> @@ -22,11 +22,11 @@ recursive::\n> \tpulling or merging one branch.\n> \n> octopus::\n> -\tThis resolves more than two-head case, but refuses to do\n> -\tcomplex merge that needs manual resolution. It is\n> +\tThis resolves the more than two-heads case, but refuses to do\n> +\ta complex merge that needs manual resolution. It is\n\nPerhaps \"resolves cases with more than two heads\" is easier to read?\n"},{"id":"109400","messageId":"249E343F-DE3D-45B1-B733-BA33FC4F2AB8@wincent.com","threadId":"18542","inReplyTo":"7vocvp310v.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Grammar fixes to \"merge\" and \"patch-id\" docs","fromName":"Wincent Colaiuta","fromEmail":"win@wincent.com","sentAt":"2009-03-25T19:03:53Z","receivedAt":"2009-03-25T19:03:53Z","isPatch":true,"sender":{"key":"greg@hurrell.net","avatar":"https://avatars.githubusercontent.com/u/7074?v=4"},"body":"El 25/3/2009, a las 19:33, Junio C Hamano escribió:\n\n> Wincent Colaiuta writes:\n>\n>> If you tried a merge which resulted in a complex conflicts and\n>> -would want to start over, you can recover with 'git-reset'.\n>> +want to start over, you can recover with 'git-reset'.\n>\n> Reads Ok to me either way...\n\n\"tried\" is in the past preterit, so the second verb, the one after the \n\"and\", should be \"want\" due to concordance. \"would want\" is not \nactually wrong, but it is bad form. It is a common mistake among non- \nnative speaker to use \"would\" when it's not required in cases like \nthis, probably due to confusion with the pattern \"If X, I would \nY\" (but note that there's no \"and\" in that case).\n\n(Speaking as a native English-speaker and part-time English teacher, \nwho this very week has been teaching classes about modal verbs like \n\"would\".)\n\n>> diff --git a/Documentation/merge-strategies.txt b/Documentation/ \n>> merge-strategies.txt\n>> index 1276f85..ee7f754 100644\n>> --- a/Documentation/merge-strategies.txt\n>> +++ b/Documentation/merge-strategies.txt\n>> @@ -3,15 +3,15 @@ MERGE STRATEGIES\n>>\n>> resolve::\n>> \tThis can only resolve two heads (i.e. the current branch\n>> -\tand another branch you pulled from) using 3-way merge\n>> +\tand another branch you pulled from) using a 3-way merge\n>> \talgorithm. It tries to carefully detect criss-cross\n>\n> Hmph, would that be an 'a' or 'the'?\n\nDoesn't really matter, IMO, but some kind of article is required \nthere. If there is literally only one 3-way merge algorithm in \ncomputer science, then \"the\" would be best. I chose \"a\" because I was \nthinking of it as \"Git's interpretation of the 3-way merge algorithm\".\n\n>> recursive::\n>> -\tThis can only resolve two heads using 3-way merge\n>> -\talgorithm. When there are more than one common\n>> -\tancestors that can be used for 3-way merge, it creates a\n>> +\tThis can only resolve two heads using a 3-way merge\n>> +\talgorithm. When there is more than one common\n>> +\tancestor that can be used for 3-way merge, it creates a\n>\n> Do you need an article before the latter \"3-way merge\", perhaps \"the\"?\n\nProbably wouldn't hurt.\n\n>> @@ -22,11 +22,11 @@ recursive::\n>> \tpulling or merging one branch.\n>>\n>> octopus::\n>> -\tThis resolves more than two-head case, but refuses to do\n>> -\tcomplex merge that needs manual resolution. It is\n>> +\tThis resolves the more than two-heads case, but refuses to do\n>> +\ta complex merge that needs manual resolution. It is\n>\n> Perhaps \"resolves cases with more than two heads\" is easier to read?\n\nYes, I agree.\n\nCheers,\nWincent\n"},{"id":"109459","messageId":"20090326022006.GB5835@coredump.intra.peff.net","threadId":"18542","inReplyTo":"7vocvp310v.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Grammar fixes to \"merge\" and \"patch-id\" docs","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-26T02:20:07Z","receivedAt":"2009-03-26T02:20:07Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Mar 25, 2009 at 11:33:52AM -0700, Junio C Hamano wrote:\n\n> Wincent Colaiuta writes:\n> \n> > If you tried a merge which resulted in a complex conflicts and\n> > -would want to start over, you can recover with 'git-reset'.\n> > +want to start over, you can recover with 'git-reset'.\n> \n> Reads Ok to me either way...\n\nWincent gave a more complete explanation, and I think he is right about\nthis change. But while reading this I also noticed \"... a complex\nconflicts ...\" in the context line which should be just \"complex\nconflicts\".\n\n-Peff\n"},{"id":"109508","messageId":"1238060344-15265-1-git-send-email-win@wincent.com","threadId":"18542","inReplyTo":"20090326022006.GB5835@coredump.intra.peff.net","subject":"[PATCH] Grammar fix for \"git merge\" man page","fromName":"Wincent Colaiuta","fromEmail":"win@wincent.com","sentAt":"2009-03-26T09:39:04Z","receivedAt":"2009-03-26T09:39:04Z","isPatch":true,"sender":{"key":"greg@hurrell.net","avatar":"https://avatars.githubusercontent.com/u/7074?v=4"},"body":"As spotted by the eagle eyes of Jeff King.\n\nSigned-off-by: Wincent Colaiuta \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 427ad90..c04ae73 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -40,7 +40,7 @@ include::merge-options.txt[]\n include::merge-strategies.txt[]\n \n \n-If you tried a merge which resulted in a complex conflicts and\n+If you tried a merge which resulted in complex conflicts and\n want to start over, you can recover with 'git-reset'.\n \n CONFIGURATION\n-- \n1.6.2.1\n"}]}