# [PATCH] docs: fix grammar in gitattributes.txt 3 messages from 2011-03-18 to 2011-03-18. Participants: Alexei Sholik, Marc Branchaud, Junio C Hamano. Thread: https://gitlist.dev/t/26770 ## Alexei Sholik, 2011-03-18 13:14 Subject: [PATCH] docs: fix grammar in gitattributes.txt Message-ID: <1300454067-9934-1-git-send-email-alcosholik@gmail.com> URL: https://gitlist.dev/e/1300454067-9934-1-git-send-email-alcosholik%40gmail.com ``` Signed-off-by: Alexei Sholik --- Documentation/gitattributes.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 7e7e121..c151657 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -632,7 +632,7 @@ Performing a three-way merge `merge` ^^^^^^^ -The attribute `merge` affects how three versions of a file is +The attribute `merge` affects how three versions of a file are merged when a file-level merge is necessary during `git merge`, and other commands such as `git revert` and `git cherry-pick`. @@ -646,15 +646,15 @@ Unset:: Take the version from the current branch as the tentative merge result, and declare that the merge has - conflicts. This is suitable for binary files that does + conflicts. This is suitable for binary files that do not have a well-defined merge semantics. Unspecified:: By default, this uses the same built-in 3-way merge - driver as is the case the `merge` attribute is set. + driver as is the case when the `merge` attribute is set. However, `merge.default` configuration variable can name - different merge driver to be used for paths to which the + different merge driver to be used with paths for which the `merge` attribute is unspecified. String:: -- 1.7.2.3 ``` ## Marc Branchaud, 2011-03-18 14:40 Subject: Re: [PATCH] docs: fix grammar in gitattributes.txt Message-ID: <4D836EE5.7060003@xiplink.com> URL: https://gitlist.dev/e/4D836EE5.7060003%40xiplink.com In-Reply-To: <1300454067-9934-1-git-send-email-alcosholik@gmail.com> ``` On 11-03-18 09:14 AM, Alexei Sholik wrote: > Signed-off-by: Alexei Sholik > --- > Documentation/gitattributes.txt | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt > index 7e7e121..c151657 100644 > --- a/Documentation/gitattributes.txt > +++ b/Documentation/gitattributes.txt > @@ -632,7 +632,7 @@ Performing a three-way merge > `merge` > ^^^^^^^ > > -The attribute `merge` affects how three versions of a file is > +The attribute `merge` affects how three versions of a file are > merged when a file-level merge is necessary during `git merge`, > and other commands such as `git revert` and `git cherry-pick`. > > @@ -646,15 +646,15 @@ Unset:: > > Take the version from the current branch as the > tentative merge result, and declare that the merge has > - conflicts. This is suitable for binary files that does > + conflicts. This is suitable for binary files that do > not have a well-defined merge semantics. > > Unspecified:: > > By default, this uses the same built-in 3-way merge > - driver as is the case the `merge` attribute is set. > + driver as is the case when the `merge` attribute is set. > However, `merge.default` configuration variable can name > - different merge driver to be used for paths to which the > + different merge driver to be used with paths for which the > `merge` attribute is unspecified. That last sentence should really start like this: - However, `merge.default` configuration variable can name + However, the `merge.default` configuration variable can name a M. ``` ## Junio C Hamano, 2011-03-18 16:59 Subject: Re: [PATCH] docs: fix grammar in gitattributes.txt Message-ID: <7v39mkxt3z.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v39mkxt3z.fsf%40alter.siamese.dyndns.org In-Reply-To: <4D836EE5.7060003@xiplink.com> ``` Thanks both; applied. ```