diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-08-25 03:54:27 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-08-25 03:54:27 +0000 |
commit | a63874253759767733cadcdda3933ad2475e905a (patch) | |
tree | f680bb640b9310d878ae526f732026fb906ba43c /gitattributes.html | |
parent | 377018d6a9542bbf1ff146837845b14e3b2c5259 (diff) | |
download | git-htmldocs-a63874253759767733cadcdda3933ad2475e905a.tar.gz |
Autogenerated HTML docs for v1.5.3-rc6-23-g0058
Diffstat (limited to 'gitattributes.html')
-rw-r--r-- | gitattributes.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html index 1a093eb3f..35a4820ea 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -546,7 +546,7 @@ want to appear as the hunk header, like this:</p> <p>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 <tt>sub</tt> followed by
+backslash, and zero or more occurrences of <tt>sub</tt> followed by
<tt>section</tt> followed by open brace, to the end of line.</p>
<p>There are a few built-in patterns to make this easier, and <tt>tex</tt>
is one of them, so you do not have to write the above in your
@@ -658,7 +658,7 @@ abc -foo -bar <li>
<p>
By examining <tt>t/.gitattributes</tt> (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. <tt>merge</tt> attribute is set. It also finds that
the second line matches, and attributes <tt>foo</tt> and <tt>bar</tt>
are unset.
@@ -682,7 +682,7 @@ Finally it examines <tt>$GIT_DIR/info/attributes</tt>. This file </p>
</li>
</ol>
-<p>As the result, the attributes assignement to <tt>t/abc</tt> becomes:</p>
+<p>As the result, the attributes assignment to <tt>t/abc</tt> becomes:</p>
<div class="listingblock">
<div class="content">
<pre><tt>foo set to true
@@ -698,7 +698,7 @@ frotz unspecified</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 30-Jul-2007 09:06:57 UTC
+Last updated 25-Aug-2007 03:53:15 UTC
</div>
</div>
</body>
|