core.excludeFile::
In addition to '.gitignore' (per-directory) and
'.git/info/exclude', git looks into this file for patterns
- of files which are not meant to be tracked.
+ of files which are not meant to be tracked. See
+ gitlink:gitignore[5].
alias.*::
Command aliases for the gitlink:git[1] command wrapper - e.g.
slowest. If not set, defaults to core.compression. If that is
not set, defaults to -1.
+pack.deltaCacheSize::
+ The maxium memory in bytes used for caching deltas in
+ gitlink:git-pack-objects[1].
+ A value of 0 means no limit. Defaults to 0.
+
+pack.deltaCacheLimit::
+ The maxium size of a delta, that is cached in
+ gitlink:git-pack-objects[1]. Defaults to 1000.
+
pull.octopus::
The default merge strategy to use when pulling multiple branches
at once.
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 26-Apr-2007 07:19:27 UTC\r
+Last updated 02-Jun-2007 21:10:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:42 UTC\r
+Last updated 02-Jun-2007 21:10:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:43 UTC\r
+Last updated 02-Jun-2007 21:10:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:46 UTC\r
+Last updated 02-Jun-2007 21:10:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-May-2007 15:54:21 UTC\r
+Last updated 02-Jun-2007 21:09:21 UTC\r
</div>\r
</div>\r
</body>\r
<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]\r
[--3way] [--interactive] [--binary]\r
[--whitespace=<option>] [-C<n>] [-p<n>]\r
- <mbox>|<Maildir>…</div></div>\r
-<p><em>git-am</em> [--skip | --resolved]</p>\r
+ <mbox>|<Maildir>…\r
+<em>git-am</em> [--skip | --resolved]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-May-2007 05:01:02 UTC\r
+Last updated 02-Jun-2007 21:09:21 UTC\r
</div>\r
</div>\r
</body>\r
[--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
<mbox>|<Maildir>...
-
'git-am' [--skip | --resolved]
DESCRIPTION
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Apr-2007 08:21:39 UTC\r
+Last updated 02-Jun-2007 21:09:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Apr-2007 08:27:40 UTC\r
+Last updated 02-Jun-2007 21:09:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-May-2007 03:12:36 UTC\r
+Last updated 02-Jun-2007 21:09:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:24 UTC\r
+Last updated 02-Jun-2007 21:09:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:24 UTC\r
+Last updated 02-Jun-2007 21:09:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:25 UTC\r
+Last updated 02-Jun-2007 21:09:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Apr-2007 10:17:28 UTC\r
+Last updated 02-Jun-2007 21:09:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Apr-2007 18:29:50 UTC\r
+Last updated 02-Jun-2007 21:09:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 16-May-2007 22:46:13 UTC\r
+Last updated 02-Jun-2007 21:09:25 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:25 UTC\r
+Last updated 02-Jun-2007 21:09:25 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:28 UTC\r
+Last updated 02-Jun-2007 21:09:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-Apr-2007 05:47:49 UTC\r
+Last updated 02-Jun-2007 21:09:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:32 UTC\r
+Last updated 02-Jun-2007 21:09:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:29 UTC\r
+Last updated 02-Jun-2007 21:09:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Apr-2007 07:34:15 UTC\r
+Last updated 02-Jun-2007 21:09:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-Apr-2007 07:19:54 UTC\r
+Last updated 02-Jun-2007 21:09:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:32 UTC\r
+Last updated 02-Jun-2007 21:09:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-May-2007 00:32:26 UTC\r
+Last updated 02-Jun-2007 21:09:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-May-2007 20:49:27 UTC\r
+Last updated 02-Jun-2007 21:09:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Apr-2007 18:29:50 UTC\r
+Last updated 02-Jun-2007 21:09:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:34 UTC\r
+Last updated 02-Jun-2007 21:09:29 UTC\r
</div>\r
</div>\r
</body>\r
<p>\r
In addition to <em>.gitignore</em> (per-directory) and\r
<em>.git/info/exclude</em>, git looks into this file for patterns\r
- of files which are not meant to be tracked.\r
+ of files which are not meant to be tracked. See\r
+ <a href="gitignore.html">gitignore(5)</a>.\r
</p>\r
</dd>\r
<dt>\r
</p>\r
</dd>\r
<dt>\r
+pack.deltaCacheSize\r
+</dt>\r
+<dd>\r
+<p>\r
+ The maxium memory in bytes used for caching deltas in\r
+ <a href="git-pack-objects.html">git-pack-objects(1)</a>.\r
+ A value of 0 means no limit. Defaults to 0.\r
+</p>\r
+</dd>\r
+<dt>\r
+pack.deltaCacheLimit\r
+</dt>\r
+<dd>\r
+<p>\r
+ The maxium size of a delta, that is cached in\r
+ <a href="git-pack-objects.html">git-pack-objects(1)</a>. Defaults to 1000.\r
+</p>\r
+</dd>\r
+<dt>\r
pull.octopus\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-May-2007 07:37:48 UTC\r
+Last updated 02-Jun-2007 21:09:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:35 UTC\r
+Last updated 02-Jun-2007 21:09:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:35 UTC\r
+Last updated 02-Jun-2007 21:09:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2007 09:17:38 UTC\r
+Last updated 02-Jun-2007 21:09:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Apr-2007 10:17:28 UTC\r
+Last updated 02-Jun-2007 21:09:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2007 09:17:38 UTC\r
+Last updated 02-Jun-2007 21:09:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:37 UTC\r
+Last updated 02-Jun-2007 21:09:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-May-2007 07:23:05 UTC\r
+Last updated 02-Jun-2007 21:09:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-May-2007 08:52:33 UTC\r
+Last updated 02-Jun-2007 21:09:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-May-2007 08:52:33 UTC\r
+Last updated 02-Jun-2007 21:09:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-May-2007 03:12:36 UTC\r
+Last updated 02-Jun-2007 21:09:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:40 UTC\r
+Last updated 02-Jun-2007 21:09:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-May-2007 23:24:40 UTC\r
+Last updated 02-Jun-2007 21:09:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:41 UTC\r
+Last updated 02-Jun-2007 21:09:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Apr-2007 08:21:40 UTC\r
+Last updated 02-Jun-2007 21:09:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:26 UTC\r
+Last updated 02-Jun-2007 21:09:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:26 UTC\r
+Last updated 02-Jun-2007 21:09:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Apr-2007 05:02:29 UTC\r
+Last updated 02-Jun-2007 21:09:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:43 UTC\r
+Last updated 02-Jun-2007 21:09:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Apr-2007 00:51:16 UTC\r
+Last updated 02-Jun-2007 21:09:40 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
Usually <em>git-gc</em> runs very quickly while providing good disk\r
- space utilization and performance. This option will cause\r
- git-gc to more aggressive optimize the repository at the expense\r
+ space utilization and performance. This option will cause\r
+ git-gc to more aggressively optimize the repository at the expense\r
of taking much more time. The effects of this optimization are\r
- persistent, so this option only needs to be sporadically; every\r
+ persistent, so this option only needs to be used occasionally; every\r
few hundred changesets or so.\r
</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-May-2007 19:11:25 UTC\r
+Last updated 02-Jun-2007 21:09:41 UTC\r
</div>\r
</div>\r
</body>\r
--aggressive::
Usually 'git-gc' runs very quickly while providing good disk
- space utilization and performance. This option will cause
- git-gc to more aggressive optimize the repository at the expense
+ space utilization and performance. This option will cause
+ git-gc to more aggressively optimize the repository at the expense
of taking much more time. The effects of this optimization are
- persistent, so this option only needs to be sporadically; every
+ persistent, so this option only needs to be used occasionally; every
few hundred changesets or so.
Configuration
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:44 UTC\r
+Last updated 02-Jun-2007 21:09:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Apr-2007 08:21:41 UTC\r
+Last updated 02-Jun-2007 21:09:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:45 UTC\r
+Last updated 02-Jun-2007 21:09:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Apr-2007 08:21:42 UTC\r
+Last updated 02-Jun-2007 21:09:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Apr-2007 08:21:43 UTC\r
+Last updated 02-Jun-2007 21:09:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:46 UTC\r
+Last updated 02-Jun-2007 21:09:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:26 UTC\r
+Last updated 02-Jun-2007 21:09:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:46 UTC\r
+Last updated 02-Jun-2007 21:09:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:47 UTC\r
+Last updated 02-Jun-2007 21:09:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:26 UTC\r
+Last updated 02-Jun-2007 21:09:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:26 UTC\r
+Last updated 02-Jun-2007 21:09:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-May-2007 03:12:36 UTC\r
+Last updated 02-Jun-2007 21:09:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 17-Apr-2007 08:27:41 UTC\r
+Last updated 02-Jun-2007 21:09:44 UTC\r
</div>\r
</div>\r
</body>\r
<div class="sectionbody">\r
<p><em>git-ls-files</em> can use a list of "exclude patterns" when\r
traversing the directory tree and finding files to show when the\r
-flags --others or --ignored are specified.</p>\r
-<p>These exclude patterns come from these places:</p>\r
+flags --others or --ignored are specified. <a href="gitignore.html">gitignore(5)</a>\r
+specifies the format of exclude patterns.</p>\r
+<p>These exclude patterns come from these places, in order:</p>\r
<ol>\r
<li>\r
<p>\r
-command line flag --exclude=<pattern> specifies a single\r
- pattern.\r
+The command line flag --exclude=<pattern> specifies a\r
+ single pattern. Patterns are ordered in the same order\r
+ they appear in the command line.\r
</p>\r
</li>\r
<li>\r
<p>\r
-command line flag --exclude-from=<file> specifies a list of\r
- patterns stored in a file.\r
+The command line flag --exclude-from=<file> specifies a\r
+ file containing a list of patterns. Patterns are ordered\r
+ in the same order they appear in the file.\r
</p>\r
</li>\r
<li>\r
<p>\r
command line flag --exclude-per-directory=<name> specifies\r
a name of the file in each directory <em>git-ls-files</em>\r
- examines, and if exists, its contents are used as an\r
- additional list of patterns.\r
+ examines, normally <tt>.gitignore</tt>. Files in deeper\r
+ directories take precedence. Patterns are ordered in the\r
+ same order they appear in the files.\r
</p>\r
</li>\r
</ol>\r
-<p>An exclude pattern file used by (2) and (3) contains one pattern\r
-per line. A line that starts with a <em>#</em> can be used as comment\r
-for readability.</p>\r
-<p>There are three lists of patterns that are in effect at a given\r
-time. They are built and ordered in the following way:</p>\r
-<ul>\r
-<li>\r
-<p>\r
---exclude=<pattern> from the command line; patterns are\r
- ordered in the same order as they appear on the command line.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-lines read from --exclude-from=<file>; patterns are ordered\r
- in the same order as they appear in the file.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-When --exclude-per-directory=<name> is specified, upon\r
- entering a directory that has such a file, its contents are\r
- appended at the end of the current "list of patterns". They\r
- are popped off when leaving the directory.\r
-</p>\r
-</li>\r
-</ul>\r
-<p>Each pattern in the pattern list specifies "a match pattern" and\r
-optionally the fate; either a file that matches the pattern is\r
-considered excluded or included. A filename is matched against\r
-the patterns in the three lists; the --exclude-from list is\r
-checked first, then the --exclude-per-directory list, and then\r
-finally the --exclude list. The last match determines its fate.\r
-If there is no match in the three lists, the fate is "included".</p>\r
<p>A pattern specified on the command line with --exclude or read\r
from the file specified with --exclude-from is relative to the\r
top of the directory tree. A pattern read from a file specified\r
by --exclude-per-directory is relative to the directory that the\r
pattern file appears in.</p>\r
-<p>An exclude pattern is of the following format:</p>\r
-<ul>\r
-<li>\r
-<p>\r
-an optional prefix <em>!</em> which means that the fate this pattern\r
- specifies is "include", not the usual "exclude"; the\r
- remainder of the pattern string is interpreted according to\r
- the following rules.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-if it does not contain a slash <em>/</em>, it is a shell glob\r
- pattern and used to match against the filename without\r
- leading directories.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-otherwise, it is a shell glob pattern, suitable for\r
- consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a\r
- slash in the pattern must match a slash in the pathname.\r
- "Documentation/*.html" matches "Documentation/git.html" but\r
- not "ppc/ppc.html". As a natural exception, "/*.c" matches\r
- "cat-file.c" but not "mozilla-sha1/sha1.c".\r
-</p>\r
-</li>\r
-</ul>\r
-<p>An example:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> $ cat .git/info/exclude\r
- # ignore objects and archives, anywhere in the tree.\r
- *.[oa]\r
- $ cat Documentation/.gitignore\r
- # ignore generated html files,\r
- *.html\r
- # except foo.html which is maintained by hand\r
- !foo.html\r
- $ git-ls-files --ignored \\r
- --exclude='Documentation/*.[0-9]' \\r
- --exclude-from=.git/info/exclude \\r
- --exclude-per-directory=.gitignore</tt></pre>\r
-</div></div>\r
-<p>Another example:</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt> $ cat .gitignore\r
- vmlinux*\r
- $ ls arch/foo/kernel/vm*\r
- arch/foo/kernel/vmlinux.lds.S\r
- $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore</tt></pre>\r
-</div></div>\r
-<p>The second .gitignore keeps <tt>arch/foo/kernel/vmlinux.lds.S</tt> file\r
-from getting ignored.</p>\r
</div>\r
<h2>See Also</h2>\r
<div class="sectionbody">\r
-<p><a href="git-read-tree.html">git-read-tree(1)</a></p>\r
+<p><a href="git-read-tree.html">git-read-tree(1)</a>, <a href="gitignore.html">gitignore(5)</a></p>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
</div>\r
<h2>Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<p>Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.</p>\r
</div>\r
<h2>GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-May-2007 04:28:37 UTC\r
+Last updated 02-Jun-2007 21:09:44 UTC\r
</div>\r
</div>\r
</body>\r
'git-ls-files' can use a list of "exclude patterns" when
traversing the directory tree and finding files to show when the
-flags --others or --ignored are specified.
+flags --others or --ignored are specified. gitlink:gitignore[5]
+specifies the format of exclude patterns.
-These exclude patterns come from these places:
+These exclude patterns come from these places, in order:
- 1. command line flag --exclude=<pattern> specifies a single
- pattern.
+ 1. The command line flag --exclude=<pattern> specifies a
+ single pattern. Patterns are ordered in the same order
+ they appear in the command line.
- 2. command line flag --exclude-from=<file> specifies a list of
- patterns stored in a file.
+ 2. The command line flag --exclude-from=<file> specifies a
+ file containing a list of patterns. Patterns are ordered
+ in the same order they appear in the file.
3. command line flag --exclude-per-directory=<name> specifies
a name of the file in each directory 'git-ls-files'
- examines, and if exists, its contents are used as an
- additional list of patterns.
-
-An exclude pattern file used by (2) and (3) contains one pattern
-per line. A line that starts with a '#' can be used as comment
-for readability.
-
-There are three lists of patterns that are in effect at a given
-time. They are built and ordered in the following way:
-
- * --exclude=<pattern> from the command line; patterns are
- ordered in the same order as they appear on the command line.
-
- * lines read from --exclude-from=<file>; patterns are ordered
- in the same order as they appear in the file.
-
- * When --exclude-per-directory=<name> is specified, upon
- entering a directory that has such a file, its contents are
- appended at the end of the current "list of patterns". They
- are popped off when leaving the directory.
-
-Each pattern in the pattern list specifies "a match pattern" and
-optionally the fate; either a file that matches the pattern is
-considered excluded or included. A filename is matched against
-the patterns in the three lists; the --exclude-from list is
-checked first, then the --exclude-per-directory list, and then
-finally the --exclude list. The last match determines its fate.
-If there is no match in the three lists, the fate is "included".
+ examines, normally `.gitignore`. Files in deeper
+ directories take precedence. Patterns are ordered in the
+ same order they appear in the files.
A pattern specified on the command line with --exclude or read
from the file specified with --exclude-from is relative to the
by --exclude-per-directory is relative to the directory that the
pattern file appears in.
-An exclude pattern is of the following format:
-
- - an optional prefix '!' which means that the fate this pattern
- specifies is "include", not the usual "exclude"; the
- remainder of the pattern string is interpreted according to
- the following rules.
-
- - if it does not contain a slash '/', it is a shell glob
- pattern and used to match against the filename without
- leading directories.
-
- - otherwise, it is a shell glob pattern, suitable for
- consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a
- slash in the pattern must match a slash in the pathname.
- "Documentation/\*.html" matches "Documentation/git.html" but
- not "ppc/ppc.html". As a natural exception, "/*.c" matches
- "cat-file.c" but not "mozilla-sha1/sha1.c".
-
-An example:
-
---------------------------------------------------------------
- $ cat .git/info/exclude
- # ignore objects and archives, anywhere in the tree.
- *.[oa]
- $ cat Documentation/.gitignore
- # ignore generated html files,
- *.html
- # except foo.html which is maintained by hand
- !foo.html
- $ git-ls-files --ignored \
- --exclude='Documentation/*.[0-9]' \
- --exclude-from=.git/info/exclude \
- --exclude-per-directory=.gitignore
---------------------------------------------------------------
-
-Another example:
-
---------------------------------------------------------------
- $ cat .gitignore
- vmlinux*
- $ ls arch/foo/kernel/vm*
- arch/foo/kernel/vmlinux.lds.S
- $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
---------------------------------------------------------------
-
-The second .gitignore keeps `arch/foo/kernel/vmlinux.lds.S` file
-from getting ignored.
-
-
See Also
--------
-gitlink:git-read-tree[1]
+gitlink:git-read-tree[1], gitlink:gitignore[5]
Author
Documentation
--------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
+Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list <git@vger.kernel.org>.
GIT
---
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:49 UTC\r
+Last updated 02-Jun-2007 21:09:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-May-2007 21:46:09 UTC\r
+Last updated 02-Jun-2007 21:09:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-May-2007 03:12:37 UTC\r
+Last updated 02-Jun-2007 21:09:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-May-2007 05:01:02 UTC\r
+Last updated 02-Jun-2007 21:09:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:50 UTC\r
+Last updated 02-Jun-2007 21:09:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:50 UTC\r
+Last updated 02-Jun-2007 21:09:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:51 UTC\r
+Last updated 02-Jun-2007 21:09:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:51 UTC\r
+Last updated 02-Jun-2007 21:09:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:51 UTC\r
+Last updated 02-Jun-2007 21:09:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2007 09:17:39 UTC\r
+Last updated 02-Jun-2007 21:09:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-May-2007 07:07:21 UTC\r
+Last updated 02-Jun-2007 21:09:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:52 UTC\r
+Last updated 02-Jun-2007 21:09:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:52 UTC\r
+Last updated 02-Jun-2007 21:09:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:53 UTC\r
+Last updated 02-Jun-2007 21:09:50 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-May-2007 07:23:07 UTC\r
+Last updated 02-Jun-2007 21:09:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:27 UTC\r
+Last updated 02-Jun-2007 21:09:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2007 09:17:39 UTC\r
+Last updated 02-Jun-2007 21:09:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:54 UTC\r
+Last updated 02-Jun-2007 21:09:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:55 UTC\r
+Last updated 02-Jun-2007 21:09:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:55 UTC\r
+Last updated 02-Jun-2007 21:09:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:55 UTC\r
+Last updated 02-Jun-2007 21:09:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:56 UTC\r
+Last updated 02-Jun-2007 21:09:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:56 UTC\r
+Last updated 02-Jun-2007 21:09:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:56 UTC\r
+Last updated 02-Jun-2007 21:09:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2007 09:17:40 UTC\r
+Last updated 02-Jun-2007 21:09:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:27 UTC\r
+Last updated 02-Jun-2007 21:09:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:58 UTC\r
+Last updated 02-Jun-2007 21:09:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<h2>See Also</h2>\r
<div class="sectionbody">\r
-<p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a></p>\r
+<p><a href="git-write-tree.html">git-write-tree(1)</a>; <a href="git-ls-files.html">git-ls-files(1)</a>;\r
+<a href="gitignore.html">gitignore(5)</a></p>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Apr-2007 10:17:29 UTC\r
+Last updated 02-Jun-2007 21:09:55 UTC\r
</div>\r
</div>\r
</body>\r
See Also
--------
-gitlink:git-write-tree[1]; gitlink:git-ls-files[1]
+gitlink:git-write-tree[1]; gitlink:git-ls-files[1];
+gitlink:gitignore[5]
Author
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-May-2007 04:51:27 UTC\r
+Last updated 02-Jun-2007 21:09:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:05 UTC\r
+Last updated 02-Jun-2007 21:09:59 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:06 UTC\r
+Last updated 02-Jun-2007 21:10:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:07 UTC\r
+Last updated 02-Jun-2007 21:10:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-May-2007 08:52:36 UTC\r
+Last updated 02-Jun-2007 21:10:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-May-2007 09:17:40 UTC\r
+Last updated 02-Jun-2007 21:10:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:10 UTC\r
+Last updated 02-Jun-2007 21:10:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:10 UTC\r
+Last updated 02-Jun-2007 21:10:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:11 UTC\r
+Last updated 02-Jun-2007 21:10:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Apr-2007 07:34:16 UTC\r
+Last updated 02-Jun-2007 21:10:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-May-2007 06:13:41 UTC\r
+Last updated 02-Jun-2007 21:10:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-May-2007 23:24:42 UTC\r
+Last updated 02-Jun-2007 21:10:08 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:12 UTC\r
+Last updated 02-Jun-2007 21:10:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-Apr-2007 04:57:05 UTC\r
+Last updated 02-Jun-2007 21:10:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:15 UTC\r
+Last updated 02-Jun-2007 21:10:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 01-May-2007 03:05:35 UTC\r
+Last updated 02-Jun-2007 21:10:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:17 UTC\r
+Last updated 02-Jun-2007 21:10:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:24 UTC\r
+Last updated 02-Jun-2007 21:10:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:18 UTC\r
+Last updated 02-Jun-2007 21:10:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Apr-2007 18:29:50 UTC\r
+Last updated 02-Jun-2007 21:10:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:20 UTC\r
+Last updated 02-Jun-2007 21:10:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:21 UTC\r
+Last updated 02-Jun-2007 21:10:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Apr-2007 21:31:10 UTC\r
+Last updated 02-Jun-2007 21:10:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-May-2007 03:12:38 UTC\r
+Last updated 02-Jun-2007 21:10:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:25 UTC\r
+Last updated 02-Jun-2007 21:10:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:26 UTC\r
+Last updated 02-Jun-2007 21:10:13 UTC\r
</div>\r
</div>\r
</body>\r
mean the same thing and the latter is kept for backward\r
compatibility) and <tt>color.status.<slot></tt> configuration variables\r
to colorize its output.</p>\r
-<p>As for <a href="git-add.html">git-add(1)</a>, the configuration variable\r
-<em>core.excludesfile</em> can indicate a path to a file containing patterns\r
-of file names to exclude, in addition to patterns given in\r
-<em>info/exclude</em> and <em>.gitignore</em>.</p>\r
+</div>\r
+<h2>See Also</h2>\r
+<div class="sectionbody">\r
+<p><a href="gitignore.html">gitignore(5)</a></p>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-May-2007 07:23:07 UTC\r
+Last updated 02-Jun-2007 21:10:13 UTC\r
</div>\r
</div>\r
</body>\r
compatibility) and `color.status.<slot>` configuration variables
to colorize its output.
-As for gitlink:git-add[1], the configuration variable
-'core.excludesfile' can indicate a path to a file containing patterns
-of file names to exclude, in addition to patterns given in
-'info/exclude' and '.gitignore'.
-
+See Also
+--------
+gitlink:gitignore[5]
Author
------
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:27 UTC\r
+Last updated 02-Jun-2007 21:10:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-May-2007 08:52:37 UTC\r
+Last updated 02-Jun-2007 21:10:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:27 UTC\r
+Last updated 02-Jun-2007 21:10:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:29 UTC\r
+Last updated 02-Jun-2007 21:10:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-May-2007 07:07:21 UTC\r
+Last updated 02-Jun-2007 21:10:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Apr-2007 02:58:27 UTC\r
+Last updated 02-Jun-2007 21:10:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:46 UTC\r
+Last updated 02-Jun-2007 21:10:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:31 UTC\r
+Last updated 02-Jun-2007 21:10:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:31 UTC\r
+Last updated 02-Jun-2007 21:10:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-May-2007 00:32:27 UTC\r
+Last updated 02-Jun-2007 21:10:15 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-May-2007 19:11:27 UTC\r
+Last updated 02-Jun-2007 21:10:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:33 UTC\r
+Last updated 02-Jun-2007 21:10:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:35 UTC\r
+Last updated 02-Jun-2007 21:10:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:34 UTC\r
+Last updated 02-Jun-2007 21:10:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:35 UTC\r
+Last updated 02-Jun-2007 21:10:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:36 UTC\r
+Last updated 02-Jun-2007 21:10:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:36 UTC\r
+Last updated 02-Jun-2007 21:10:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:37 UTC\r
+Last updated 02-Jun-2007 21:10:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:37 UTC\r
+Last updated 02-Jun-2007 21:10:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-May-2007 09:08:17 UTC\r
+Last updated 02-Jun-2007 21:10:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-May-2007 03:12:38 UTC\r
+Last updated 02-Jun-2007 21:10:17 UTC\r
</div>\r
</div>\r
</body>\r
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+ border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+ margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+ font-style: italic;\r
+}\r
+\r
+strong {\r
+ font-weight: bold;\r
+}\r
+\r
+tt {\r
+ color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ margin-top: 1.2em;\r
+ margin-bottom: 0.5em;\r
+ line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+ border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+ border-bottom: 2px solid silver;\r
+ padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+ font-family: serif;\r
+ margin-left: 0;\r
+}\r
+\r
+hr {\r
+ border: 1px solid silver;\r
+}\r
+\r
+p {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+ padding: 0;\r
+ margin: 0;\r
+}\r
+\r
+span#author {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+ font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+ font-family: sans-serif;\r
+ font-size: small;\r
+ border-top: 2px solid silver;\r
+ padding-top: 0.5em;\r
+ margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+ float: left;\r
+ padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+ float: right;\r
+ padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+ margin-right: 10%;\r
+ margin-top: 1.5em;\r
+ margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+ margin-top: 2.5em;\r
+ margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+ padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ text-align: left;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+ margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+ margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+ padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+ text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+ vertical-align: top;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ text-decoration: underline;\r
+ color: #527bbd;\r
+ padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+ padding-left: 0.5em;\r
+ border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+ border-left: 2px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+ white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+dt {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0;\r
+ font-style: italic;\r
+}\r
+dd > *:first-child {\r
+ margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+ list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+ list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+ border-color: #527bbd;\r
+ border-width: 3px;\r
+}\r
+thead {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+}\r
+tfoot {\r
+ font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+ vertical-align: top;\r
+ font-style: italic;\r
+ padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+ vertical-align: top;\r
+}\r
+\r
+@media print {\r
+ div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ margin-top: 0.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+ padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+ border-left: 2px solid silver;\r
+ padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>gitignore(5)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+gitignore(5) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>gitignore -\r
+ Specifies intentionally untracked files to ignore\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p>$GIT_DIR/info/exclude, .gitignore</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>A <tt>gitignore</tt> file specifies intentionally untracked files that\r
+git should ignore. Each line in a <tt>gitignore</tt> file specifies a\r
+pattern.</p>\r
+<p>When deciding whether to ignore a path, git normally checks\r
+<tt>gitignore</tt> patterns from multiple sources, with the following\r
+order of precedence:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+Patterns read from the file specified by the configuration\r
+ variable <em>core.excludesfile</em>.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Patterns read from <tt>$GIT_DIR/info/exclude</tt>.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Patterns read from a <tt>.gitignore</tt> file in the same directory\r
+ as the path, or in any parent directory, ordered from the\r
+ deepest such file to a file in the root of the repository.\r
+ These patterns match relative to the location of the\r
+ <tt>.gitignore</tt> file. A project normally includes such\r
+ <tt>.gitignore</tt> files in its repository, containing patterns for\r
+ files generated as part of the project build.\r
+</p>\r
+</li>\r
+</ul>\r
+<p>The underlying git plumbing tools, such as\r
+<a href="git-ls-files.html">git-ls-files(1)</a> and <a href="git-read-tree.html">git-read-tree(1)</a>, read\r
+<tt>gitignore</tt> patterns specified by command-line options, or from\r
+files specified by command-line options. Higher-level git\r
+tools, such as <a href="git-status.html">git-status(1)</a> and <a href="git-add.html">git-add(1)</a>,\r
+use patterns from the sources specified above.</p>\r
+<p>Patterns have the following format:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+A blank line matches no files, so it can serve as a separator\r
+ for readability.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+A line starting with # serves as a comment.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+An optional prefix <em>!</em> which negates the pattern; any\r
+ matching file excluded by a previous pattern will become\r
+ included again.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+If the pattern does not contain a slash <em>/</em>, git treats it as\r
+ a shell glob pattern and checks for a match against the\r
+ pathname without leading directories.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Otherwise, git treats the pattern as a shell glob suitable\r
+ for consumption by fnmatch(3) with the FNM_PATHNAME flag:\r
+ wildcards in the pattern will not match a / in the pathname.\r
+ For example, "Documentation/*.html" matches\r
+ "Documentation/git.html" but not\r
+ "Documentation/ppc/ppc.html". A leading slash matches the\r
+ beginning of the pathname; for example, "/*.c" matches\r
+ "cat-file.c" but not "mozilla-sha1/sha1.c".\r
+</p>\r
+</li>\r
+</ul>\r
+<p>An example:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> $ git-status\r
+ [...]\r
+ # Untracked files:\r
+ [...]\r
+ # Documentation/foo.html\r
+ # Documentation/gitignore.html\r
+ # file.o\r
+ # lib.a\r
+ # src/internal.o\r
+ [...]\r
+ $ cat .git/info/exclude\r
+ # ignore objects and archives, anywhere in the tree.\r
+ *.[oa]\r
+ $ cat Documentation/.gitignore\r
+ # ignore generated html files,\r
+ *.html\r
+ # except foo.html which is maintained by hand\r
+ !foo.html\r
+ $ git-status\r
+ [...]\r
+ # Untracked files:\r
+ [...]\r
+ # Documentation/foo.html\r
+ [...]</tt></pre>\r
+</div></div>\r
+<p>Another example:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt> $ cat .gitignore\r
+ vmlinux*\r
+ $ ls arch/foo/kernel/vm*\r
+ arch/foo/kernel/vmlinux.lds.S\r
+ $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore</tt></pre>\r
+</div></div>\r
+<p>The second .gitignore prevents git from ignoring\r
+<tt>arch/foo/kernel/vmlinux.lds.S</tt>.</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by David Greaves, Junio C Hamano, Josh Triplett,\r
+Frank Lichtenheld, and the git-list <git@vger.kernel.org>.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 02-Jun-2007 21:10:18 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r
--- /dev/null
+gitignore(5)
+============
+
+NAME
+----
+gitignore - Specifies intentionally untracked files to ignore
+
+SYNOPSIS
+--------
+$GIT_DIR/info/exclude, .gitignore
+
+DESCRIPTION
+-----------
+
+A `gitignore` file specifies intentionally untracked files that
+git should ignore. Each line in a `gitignore` file specifies a
+pattern.
+
+When deciding whether to ignore a path, git normally checks
+`gitignore` patterns from multiple sources, with the following
+order of precedence:
+
+ * Patterns read from the file specified by the configuration
+ variable 'core.excludesfile'.
+
+ * Patterns read from `$GIT_DIR/info/exclude`.
+
+ * Patterns read from a `.gitignore` file in the same directory
+ as the path, or in any parent directory, ordered from the
+ deepest such file to a file in the root of the repository.
+ These patterns match relative to the location of the
+ `.gitignore` file. A project normally includes such
+ `.gitignore` files in its repository, containing patterns for
+ files generated as part of the project build.
+
+The underlying git plumbing tools, such as
+gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read
+`gitignore` patterns specified by command-line options, or from
+files specified by command-line options. Higher-level git
+tools, such as gitlink:git-status[1] and gitlink:git-add[1],
+use patterns from the sources specified above.
+
+Patterns have the following format:
+
+ - A blank line matches no files, so it can serve as a separator
+ for readability.
+
+ - A line starting with # serves as a comment.
+
+ - An optional prefix '!' which negates the pattern; any
+ matching file excluded by a previous pattern will become
+ included again.
+
+ - If the pattern does not contain a slash '/', git treats it as
+ a shell glob pattern and checks for a match against the
+ pathname without leading directories.
+
+ - 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/\*.html" matches
+ "Documentation/git.html" but not
+ "Documentation/ppc/ppc.html". A leading slash matches the
+ beginning of the pathname; for example, "/*.c" matches
+ "cat-file.c" but not "mozilla-sha1/sha1.c".
+
+An example:
+
+--------------------------------------------------------------
+ $ git-status
+ [...]
+ # Untracked files:
+ [...]
+ # Documentation/foo.html
+ # Documentation/gitignore.html
+ # file.o
+ # lib.a
+ # src/internal.o
+ [...]
+ $ cat .git/info/exclude
+ # ignore objects and archives, anywhere in the tree.
+ *.[oa]
+ $ cat Documentation/.gitignore
+ # ignore generated html files,
+ *.html
+ # except foo.html which is maintained by hand
+ !foo.html
+ $ git-status
+ [...]
+ # Untracked files:
+ [...]
+ # Documentation/foo.html
+ [...]
+--------------------------------------------------------------
+
+Another example:
+
+--------------------------------------------------------------
+ $ cat .gitignore
+ vmlinux*
+ $ ls arch/foo/kernel/vm*
+ arch/foo/kernel/vmlinux.lds.S
+ $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
+--------------------------------------------------------------
+
+The second .gitignore prevents git from ignoring
+`arch/foo/kernel/vmlinux.lds.S`.
+
+Documentation
+-------------
+Documentation by David Greaves, Junio C Hamano, Josh Triplett,
+Frank Lichtenheld, and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:38 UTC\r
+Last updated 02-Jun-2007 21:10:17 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-May-2007 04:28:37 UTC\r
+Last updated 02-Jun-2007 21:10:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-May-2007 22:18:55 UTC\r
+Last updated 02-Jun-2007 21:10:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:44 UTC\r
+Last updated 02-Jun-2007 21:10:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:48 UTC\r
+Last updated 02-Jun-2007 21:10:23 UTC\r
</div>\r
</div>\r
</body>\r
exclude pattern list. <tt>.gitignore</tt> is the per-directory\r
ignore file. <tt>git status</tt>, <tt>git add</tt>, <tt>git rm</tt> and <tt>git\r
clean</tt> look at it but the core git commands do not look\r
- at it. See also: <a href="git-ls-files.html">git-ls-files(1)</a> <tt>—exclude-from</tt>\r
- and <tt>—exclude-per-directory</tt>.\r
+ at it. See also: <a href="gitignore.html">gitignore(5)</a>.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:45 UTC\r
+Last updated 02-Jun-2007 21:10:21 UTC\r
</div>\r
</div>\r
</body>\r
exclude pattern list. `.gitignore` is the per-directory
ignore file. `git status`, `git add`, `git rm` and `git
clean` look at it but the core git commands do not look
- at it. See also: gitlink:git-ls-files[1] `--exclude-from`
- and `--exclude-per-directory`.
+ at it. See also: gitlink:gitignore[5].
remotes::
Stores shorthands to be used to give URL and default
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-May-2007 09:08:18 UTC\r
+Last updated 02-Jun-2007 21:10:19 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 20-May-2007 09:08:17 UTC\r
+Last updated 02-Jun-2007 21:10:18 UTC\r
</div>\r
</div>\r
</body>\r
"<code class="literal">git add .</code>" and "<code class="literal">git commit -a</code>" practically useless, and they keep
showing up in the output of "<code class="literal">git status</code>", etc.</p><p>Git therefore provides "exclude patterns" for telling git which files to
actively ignore. Exclude patterns are thoroughly explained in the
-"Exclude Patterns" section of the <a href="git-ls-files.html" target="_top">git-ls-files(1)</a> manual page,
-but the heart of the concept is simply a list of files which git should
-ignore. Entries in the list may contain globs to specify multiple files,
-or may be prefixed by "<code class="literal">!</code>" to explicitly include (un-ignore) a previously
-excluded (ignored) file (i.e. later exclude patterns override earlier ones).
-
The following example should illustrate such patterns:</p><div class="literallayout"><p># Lines starting with '#' are considered comments.<br>
+<a href="gitignore.html" target="_top">gitignore(5)</a> manual page, but the heart of the concept is simply
+a list of files which git should ignore. Entries in the list may contain
+globs to specify multiple files, or may be prefixed by "<code class="literal">!</code>" to
+explicitly include (un-ignore) a previously excluded (ignored) file
+(i.e. later exclude patterns override earlier ones). The following
+example should illustrate such patterns:</p><div class="literallayout"><p># Lines starting with '#' are considered comments.<br>
# Ignore foo.txt.<br>
foo.txt<br>
# Ignore (generated) html files,<br>
Git therefore provides "exclude patterns" for telling git which files to
actively ignore. Exclude patterns are thoroughly explained in the
-"Exclude Patterns" section of the gitlink:git-ls-files[1] manual page,
-but the heart of the concept is simply a list of files which git should
-ignore. Entries in the list may contain globs to specify multiple files,
-or may be prefixed by "`!`" to explicitly include (un-ignore) a previously
-excluded (ignored) file (i.e. later exclude patterns override earlier ones).
-The following example should illustrate such patterns:
+gitlink:gitignore[5] manual page, but the heart of the concept is simply
+a list of files which git should ignore. Entries in the list may contain
+globs to specify multiple files, or may be prefixed by "`!`" to
+explicitly include (un-ignore) a previously excluded (ignored) file
+(i.e. later exclude patterns override earlier ones). The following
+example should illustrate such patterns:
-------------------------------------------------
# Lines starting with '#' are considered comments.
projects / git.git / commitdiff