summaryrefslogtreecommitdiffstats
path: root/gitignore.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-05 21:13:21 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-05 21:13:21 -0800
commit076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch)
tree6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /gitignore.html
parent3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff)
downloadgit-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'gitignore.html')
-rw-r--r--gitignore.html24
1 files changed, 12 insertions, 12 deletions
diff --git a/gitignore.html b/gitignore.html
index 6f882ef4d..2f5dec69e 100644
--- a/gitignore.html
+++ b/gitignore.html
@@ -752,11 +752,11 @@ gitignore(5) Manual Page
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>A <code>gitignore</code> file specifies intentionally untracked files that
-git should ignore.
-Files already tracked by git are not affected; see the NOTES
+Git should ignore.
+Files already tracked by Git are not affected; see the NOTES
below for details.</p></div>
<div class="paragraph"><p>Each line in a <code>gitignore</code> file specifies a pattern.
-When deciding whether to ignore a path, git normally checks
+When deciding whether to ignore a path, Git normally checks
<code>gitignore</code> patterns from multiple sources, with the following
order of precedence, from highest to lowest (within one level of
precedence, the last matching pattern decides the outcome):</p></div>
@@ -812,7 +812,7 @@ Patterns which are
</li>
<li>
<p>
-Patterns which a user wants git to
+Patterns which a user wants Git to
ignore in all situations (e.g., backup or temporary files generated by
the user&#8217;s editor of choice) generally go into a file specified by
<code>core.excludesfile</code> in the user&#8217;s <code>~/.gitconfig</code>. Its default value is
@@ -821,10 +821,10 @@ Patterns which a user wants git to
</p>
</li>
</ul></div>
-<div class="paragraph"><p>The underlying git plumbing tools, such as
+<div class="paragraph"><p>The underlying Git plumbing tools, such as
<em>git ls-files</em> and <em>git read-tree</em>, read
<code>gitignore</code> patterns specified by command-line options, or from
-files specified by command-line options. Higher-level git
+files specified by command-line options. Higher-level Git
tools, such as <em>git status</em> and <em>git add</em>,
use patterns from the sources specified above.</p></div>
</div>
@@ -863,12 +863,12 @@ If the pattern ends with a slash, it is removed for the
a match with a directory. In other words, <code>foo/</code> will match a
directory <code>foo</code> and paths underneath it, but will not match a
regular file or a symbolic link <code>foo</code> (this is consistent
- with the way how pathspec works in general in git).
+ with the way how pathspec works in general in Git).
</p>
</li>
<li>
<p>
-If the pattern does not contain a slash <em>/</em>, git treats it as
+If the pattern does not contain a slash <em>/</em>, Git treats it as
a shell glob pattern and checks for a match against the
pathname relative to the location of the <code>.gitignore</code> file
(relative to the toplevel of the work tree if not from a
@@ -877,7 +877,7 @@ If the pattern does not contain a slash <em>/</em>, git treats it as
</li>
<li>
<p>
-Otherwise, git treats the pattern as a shell glob suitable
+Otherwise, Git treats the pattern as a shell glob suitable
for consumption by fnmatch(3) with the FNM_PATHNAME flag:
wildcards in the pattern will not match a / in the pathname.
For example, "Documentation/&#42;.html" matches
@@ -931,7 +931,7 @@ Other consecutive asterisks are considered invalid.
<h2 id="_notes">NOTES</h2>
<div class="sectionbody">
<div class="paragraph"><p>The purpose of gitignore files is to ensure that certain files
-not tracked by git remain untracked.</p></div>
+not tracked by Git remain untracked.</p></div>
<div class="paragraph"><p>To ignore uncommitted changes in a file that is already tracked,
use <em>git update-index &#45;&#45;assume-unchanged</em>.</p></div>
<div class="paragraph"><p>To stop tracking a file that is currently tracked, use
@@ -977,7 +977,7 @@ use <em>git update-index &#45;&#45;assume-unchanged</em>.</p></div>
arch/foo/kernel/vmlinux.lds.S
$ echo '!/vmlinux*' &gt;arch/foo/kernel/.gitignore</code></pre>
</div></div>
-<div class="paragraph"><p>The second .gitignore prevents git from ignoring
+<div class="paragraph"><p>The second .gitignore prevents Git from ignoring
<code>arch/foo/kernel/vmlinux.lds.S</code>.</p></div>
</div>
</div>
@@ -1000,7 +1000,7 @@ use <em>git update-index &#45;&#45;assume-unchanged</em>.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-01-25 13:32:06 PST
+Last updated 2013-02-05 21:07:26 PST
</div>
</div>
</body>