summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorBrian Hetro <whee@smaertness.net>2007-08-24 00:44:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-25 01:54:37 (GMT)
commit027830755d2972ab2201c53922ce402862a2bd80 (patch)
tree2be60c62bff96cbc3a1f2c2d0080e9f5750c95fa /Documentation/gitattributes.txt
parentdb21872395a1a092faa85ef9c1ea53588d8414f0 (diff)
downloadgit-027830755d2972ab2201c53922ce402862a2bd80.zip
git-027830755d2972ab2201c53922ce402862a2bd80.tar.gz
git-027830755d2972ab2201c53922ce402862a2bd80.tar.bz2
Documentation: Correct various misspellings and typos.
Fix minor typos throughout the documentation. Signed-off-by: Brian Hetro <whee@smaertness.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 8b90a5b..46f9d59 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -285,7 +285,7 @@ want to appear as the hunk header, like this:
Note. A single level of backslashes are eaten by the
configuration file parser, so you would need to double the
backslashes; the pattern above picks a line that begins with a
-backslash, and zero or more occurences of `sub` followed by
+backslash, and zero or more occurrences of `sub` followed by
`section` followed by open brace, to the end of line.
There are a few built-in patterns to make this easier, and `tex`
@@ -394,7 +394,7 @@ abc -foo -bar
the attributes given to path `t/abc` are computed as follows:
1. By examining `t/.gitattributes` (which is in the same
- diretory as the path in question), git finds that the first
+ directory as the path in question), git finds that the first
line matches. `merge` attribute is set. It also finds that
the second line matches, and attributes `foo` and `bar`
are unset.
@@ -410,7 +410,7 @@ the attributes given to path `t/abc` are computed as follows:
a match, and `foo` is set, `bar` is reverted to unspecified
state, and `baz` is unset.
-As the result, the attributes assignement to `t/abc` becomes:
+As the result, the attributes assignment to `t/abc` becomes:
----------------------------------------------------------------
foo set to true