Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
docs: fix grammar in gitattributes.txt
author
Alexei Sholik
<alcosholik@gmail.com>
Fri, 18 Mar 2011 13:14:27 +0000
(15:14 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 18 Mar 2011 16:58:47 +0000
(09:58 -0700)
[jc: with a fixlet from Marc Branchaud]
Signed-off-by: Alexei Sholik <alcosholik@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitattributes.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
fbcda3c
)
diff --git
a/Documentation/gitattributes.txt
b/Documentation/gitattributes.txt
index 7e7e12168eb69d43f6d7eea9cde2176e06fe73d5..15aebc60623d97053aa14f3e6463d12eb8f60f26 100644
(file)
--- a/
Documentation/gitattributes.txt
+++ b/
Documentation/gitattributes.txt
@@
-632,7
+632,7
@@
Performing a three-way merge
`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`.
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
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 do
es
+ 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
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.
- However, `merge.default` configuration variable can name
- different merge driver to be used
for paths to
which the
+ driver as is the case
when
the `merge` attribute is set.
+ However,
the
`merge.default` configuration variable can name
+ different merge driver to be used
with paths for
which the
`merge` attribute is unspecified.
String::
`merge` attribute is unspecified.
String::