* [PATCH] docs: fix grammar in gitattributes.txt
@ 2011-03-18 13:14 Alexei Sholik
2011-03-18 14:40 ` Marc Branchaud
0 siblings, 1 reply; 3+ messages in thread
From: Alexei Sholik @ 2011-03-18 13:14 UTC (permalink / raw
To: git; +Cc: Alexei Sholik
Signed-off-by: Alexei Sholik <alcosholik@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: fix grammar in gitattributes.txt
2011-03-18 13:14 [PATCH] docs: fix grammar in gitattributes.txt Alexei Sholik
@ 2011-03-18 14:40 ` Marc Branchaud
2011-03-18 16:59 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Marc Branchaud @ 2011-03-18 14:40 UTC (permalink / raw
To: Alexei Sholik; +Cc: git
On 11-03-18 09:14 AM, Alexei Sholik wrote:
> Signed-off-by: Alexei Sholik <alcosholik@gmail.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: fix grammar in gitattributes.txt
2011-03-18 14:40 ` Marc Branchaud
@ 2011-03-18 16:59 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2011-03-18 16:59 UTC (permalink / raw
To: Marc Branchaud; +Cc: Alexei Sholik, git
Thanks both; applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-18 16:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-18 13:14 [PATCH] docs: fix grammar in gitattributes.txt Alexei Sholik
2011-03-18 14:40 ` Marc Branchaud
2011-03-18 16:59 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).