{"thread":{"id":"26770","subject":"[PATCH] docs: fix grammar in gitattributes.txt","startedAt":"2011-03-18T13:14:27Z","lastAt":"2011-03-18T16:59:12Z","messageCount":3,"participants":["Alexei Sholik","Marc Branchaud","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"163632","messageId":"1300454067-9934-1-git-send-email-alcosholik@gmail.com","threadId":"26770","inReplyTo":null,"subject":"[PATCH] docs: fix grammar in gitattributes.txt","fromName":"Alexei Sholik","fromEmail":"alcosholik@gmail.com","sentAt":"2011-03-18T13:14:27Z","receivedAt":"2011-03-18T13:14:27Z","isPatch":true,"sender":{"key":"alcosholik@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207748?v=4"},"body":"Signed-off-by: Alexei Sholik <alcosholik@gmail.com>\n---\n Documentation/gitattributes.txt |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 7e7e121..c151657 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -632,7 +632,7 @@ Performing a three-way merge\n `merge`\n ^^^^^^^\n \n-The attribute `merge` affects how three versions of a file is\n+The attribute `merge` affects how three versions of a file are\n merged when a file-level merge is necessary during `git merge`,\n and other commands such as `git revert` and `git cherry-pick`.\n \n@@ -646,15 +646,15 @@ Unset::\n \n \tTake the version from the current branch as the\n \ttentative merge result, and declare that the merge has\n-\tconflicts.  This is suitable for binary files that does\n+\tconflicts.  This is suitable for binary files that do\n \tnot have a well-defined merge semantics.\n \n Unspecified::\n \n \tBy default, this uses the same built-in 3-way merge\n-\tdriver as is the case the `merge` attribute is set.\n+\tdriver as is the case when the `merge` attribute is set.\n \tHowever, `merge.default` configuration variable can name\n-\tdifferent merge driver to be used for paths to which the\n+\tdifferent merge driver to be used with paths for which the\n \t`merge` attribute is unspecified.\n \n String::\n-- \n1.7.2.3\n"},{"id":"163638","messageId":"4D836EE5.7060003@xiplink.com","threadId":"26770","inReplyTo":"1300454067-9934-1-git-send-email-alcosholik@gmail.com","subject":"Re: [PATCH] docs: fix grammar in gitattributes.txt","fromName":"Marc Branchaud","fromEmail":"marcnarc@xiplink.com","sentAt":"2011-03-18T14:40:37Z","receivedAt":"2011-03-18T14:40:37Z","isPatch":true,"sender":{"key":"marcnarc@xiplink.com","avatar":"https://avatars.githubusercontent.com/u/14980203?v=4"},"body":"On 11-03-18 09:14 AM, Alexei Sholik wrote:\n> Signed-off-by: Alexei Sholik <alcosholik@gmail.com>\n> ---\n>  Documentation/gitattributes.txt |    8 ++++----\n>  1 files changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\n> index 7e7e121..c151657 100644\n> --- a/Documentation/gitattributes.txt\n> +++ b/Documentation/gitattributes.txt\n> @@ -632,7 +632,7 @@ Performing a three-way merge\n>  `merge`\n>  ^^^^^^^\n>  \n> -The attribute `merge` affects how three versions of a file is\n> +The attribute `merge` affects how three versions of a file are\n>  merged when a file-level merge is necessary during `git merge`,\n>  and other commands such as `git revert` and `git cherry-pick`.\n>  \n> @@ -646,15 +646,15 @@ Unset::\n>  \n>  \tTake the version from the current branch as the\n>  \ttentative merge result, and declare that the merge has\n> -\tconflicts.  This is suitable for binary files that does\n> +\tconflicts.  This is suitable for binary files that do\n>  \tnot have a well-defined merge semantics.\n>  \n>  Unspecified::\n>  \n>  \tBy default, this uses the same built-in 3-way merge\n> -\tdriver as is the case the `merge` attribute is set.\n> +\tdriver as is the case when the `merge` attribute is set.\n>  \tHowever, `merge.default` configuration variable can name\n> -\tdifferent merge driver to be used for paths to which the\n> +\tdifferent merge driver to be used with paths for which the\n>  \t`merge` attribute is unspecified.\n\nThat last sentence should really start like this:\n\n- \tHowever, `merge.default` configuration variable can name\n+ \tHowever, the `merge.default` configuration variable can name a\n\n\t\tM.\n"},{"id":"163654","messageId":"7v39mkxt3z.fsf@alter.siamese.dyndns.org","threadId":"26770","inReplyTo":"4D836EE5.7060003@xiplink.com","subject":"Re: [PATCH] docs: fix grammar in gitattributes.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-18T16:59:12Z","receivedAt":"2011-03-18T16:59:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks both; applied.\n"}]}