diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
| commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
| tree | 390507328a7564b65dc803683c34235700b97409 /gitattributes.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 356 |
1 files changed, 202 insertions, 154 deletions
diff --git a/gitattributes.html b/gitattributes.html index 49663c8a7..67924d0b9 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.2" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body { margin: 1em 5% 1em 5%;
}
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
em {
font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.3;
}
-h1 {
+h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
- border-bottom: 2px solid silver;
padding-top: 0.5em;
}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
div.sectionbody {
font-family: serif;
@@ -70,7 +80,7 @@ span#author { color: #527bbd;
font-family: sans-serif;
font-weight: bold;
- font-size: 1.2em;
+ font-size: 1.1em;
}
span#email {
}
@@ -139,6 +149,9 @@ div.sidebarblock > div.content { padding: 0.5em;
}
+div.listingblock {
+ margin-right: 0%;
+}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content { div.quoteblock > div.content {
padding-left: 2.0em;
}
-div.quoteblock .attribution {
+
+div.attribution {
text-align: right;
}
+div.verseblock + div.attribution {
+ text-align: left;
+}
div.admonitionblock .icon {
vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child { ul, ol {
list-style-position: outside;
}
-ol.olist2 {
+div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
- border-color: #527bbd;
- border-width: 3px;
+ border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist { margin-top: 0.8em;
margin-bottom: 0.8em;
}
+div.hlist td {
+ padding-bottom: 5px;
+}
td.hlist1 {
vertical-align: top;
font-style: italic;
@@ -226,7 +245,33 @@ td.hlist2 { @media print {
div#footer-badges { display: none; }
}
-include::./stylesheets/xhtml11-manpage.css[]
+
+div#toctitle {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -255,6 +300,9 @@ div.exampleblock-content { border-left: 2px solid silver;
padding-left: 0.5em;
}
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
</style>
<title>gitattributes(5)</title>
</head>
@@ -272,23 +320,23 @@ gitattributes(5) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p>$GIT_DIR/info/attributes, gitattributes</p>
+<div class="para"><p>$GIT_DIR/info/attributes, gitattributes</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>A <tt>gitattributes</tt> file is a simple text file that gives
-<tt>attributes</tt> to pathnames.</p>
-<p>Each line in <tt>gitattributes</tt> file is of form:</p>
+<div class="para"><p>A <tt>gitattributes</tt> file is a simple text file that gives
+<tt>attributes</tt> to pathnames.</p></div>
+<div class="para"><p>Each line in <tt>gitattributes</tt> file is of form:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>glob attr1 attr2 ...</tt></pre>
</div></div>
-<p>That is, a glob pattern followed by an attributes list,
+<div class="para"><p>That is, a glob pattern followed by an attributes list,
separated by whitespaces. When the glob pattern matches the
path in question, the attributes listed on the line are given to
-the path.</p>
-<p>Each attribute can be in one of these states for a given path:</p>
-<dl>
+the path.</p></div>
+<div class="para"><p>Each attribute can be in one of these states for a given path:</p></div>
+<div class="vlist"><dl>
<dt>
Set
</dt>
@@ -330,40 +378,40 @@ Unspecified attribute for the path is said to be Unspecified.
</p>
</dd>
-</dl>
-<p>When more than one glob pattern matches the path, a later line
+</dl></div>
+<div class="para"><p>When more than one glob pattern matches the path, a later line
overrides an earlier line. This overriding is done per
-attribute.</p>
-<p>When deciding what attributes are assigned to a path, git
+attribute.</p></div>
+<div class="para"><p>When deciding what attributes are assigned to a path, git
consults <tt>$GIT_DIR/info/attributes</tt> file (which has the highest
precedence), <tt>.gitattributes</tt> file in the same directory as the
path in question, and its parent directories (the further the
directory that contains <tt>.gitattributes</tt> is from the path in
-question, the lower its precedence).</p>
-<p>If you wish to affect only a single repository (i.e., to assign
+question, the lower its precedence).</p></div>
+<div class="para"><p>If you wish to affect only a single repository (i.e., to assign
attributes to files that are particular to one user's workflow), then
attributes should be placed in the <tt>$GIT_DIR/info/attributes</tt> file.
Attributes which should be version-controlled and distributed to other
repositories (i.e., attributes of interest to all users) should go into
-<tt>.gitattributes</tt> files.</p>
-<p>Sometimes you would need to override an setting of an attribute
+<tt>.gitattributes</tt> files.</p></div>
+<div class="para"><p>Sometimes you would need to override an setting of an attribute
for a path to <tt>unspecified</tt> state. This can be done by listing
-the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p>
+the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p></div>
</div>
-<h2>EFFECTS</h2>
+<h2 id="_effects">EFFECTS</h2>
<div class="sectionbody">
-<p>Certain operations by git can be influenced by assigning
+<div class="para"><p>Certain operations by git can be influenced by assigning
particular attributes to a path. Currently, the following
-operations are attributes-aware.</p>
-<h3>Checking-out and checking-in</h3>
-<p>These attributes affect how the contents stored in the
+operations are attributes-aware.</p></div>
+<h3 id="_checking_out_and_checking_in">Checking-out and checking-in</h3><div style="clear:left"></div>
+<div class="para"><p>These attributes affect how the contents stored in the
repository are copied to the working tree files when commands
-such as <tt>git-checkout</tt> and <tt>git-merge</tt> run. They also affect how
+such as <em>git-checkout</em> and <em>git-merge</em> run. They also affect how
git stores the contents you prepare in the working tree in the
-repository upon <tt>git-add</tt> and <tt>git-commit</tt>.</p>
-<h4><tt>crlf</tt></h4>
-<p>This attribute controls the line-ending convention.</p>
-<dl>
+repository upon <em>git-add</em> and <em>git-commit</em>.</p></div>
+<h4 id="_tt_crlf_tt"><tt>crlf</tt></h4>
+<div class="para"><p>This attribute controls the line-ending convention.</p></div>
+<div class="vlist"><dl>
<dt>
Set
</dt>
@@ -405,36 +453,36 @@ Set to string value "input" <tt>input</tt> for the path.
</p>
</dd>
-</dl>
-<p>Any other value set to <tt>crlf</tt> attribute is ignored and git acts
-as if the attribute is left unspecified.</p>
-<h4>The <tt>core.autocrlf</tt> conversion</h4>
-<p>If the configuration variable <tt>core.autocrlf</tt> is false, no
-conversion is done.</p>
-<p>When <tt>core.autocrlf</tt> is true, it means that the platform wants
+</dl></div>
+<div class="para"><p>Any other value set to <tt>crlf</tt> attribute is ignored and git acts
+as if the attribute is left unspecified.</p></div>
+<h4 id="_the_tt_core_autocrlf_tt_conversion">The <tt>core.autocrlf</tt> conversion</h4>
+<div class="para"><p>If the configuration variable <tt>core.autocrlf</tt> is false, no
+conversion is done.</p></div>
+<div class="para"><p>When <tt>core.autocrlf</tt> is true, it means that the platform wants
CRLF line endings for files in the working tree, and you want to
convert them back to the normal LF line endings when checking
-in to the repository.</p>
-<p>When <tt>core.autocrlf</tt> is set to "input", line endings are
+in to the repository.</p></div>
+<div class="para"><p>When <tt>core.autocrlf</tt> is set to "input", line endings are
converted to LF upon checkin, but there is no conversion done
-upon checkout.</p>
-<p>If <tt>core.safecrlf</tt> is set to "true" or "warn", git verifies if
+upon checkout.</p></div>
+<div class="para"><p>If <tt>core.safecrlf</tt> is set to "true" or "warn", git verifies if
the conversion is reversible for the current setting of
<tt>core.autocrlf</tt>. For "true", git rejects irreversible
conversions; for "warn", git only prints a warning but accepts
an irreversible conversion. The safety triggers to prevent such
a conversion done to the files in the work tree, but there are a
-few exceptions. Even though…</p>
-<ul>
+few exceptions. Even though…</p></div>
+<div class="ilist"><ul>
<li>
<p>
-<tt>git-add</tt> itself does not touch the files in the work tree, the
+<em>git-add</em> itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
</p>
</li>
<li>
<p>
-<tt>git-apply</tt> to update a text file with a patch does touch the files
+<em>git-apply</em> to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
@@ -442,52 +490,52 @@ few exceptions. Even though…</p> </li>
<li>
<p>
-<tt>git-diff</tt> itself does not touch the files in the work tree, it is
- often run to inspect the changes you intend to next <tt>git-add</tt>. To
+<em>git-diff</em> itself does not touch the files in the work tree, it is
+ often run to inspect the changes you intend to next <em>git-add</em>. To
catch potential problems early, safety triggers.
</p>
</li>
-</ul>
-<h4><tt>ident</tt></h4>
-<p>When the attribute <tt>ident</tt> is set to a path, git replaces
+</ul></div>
+<h4 id="_tt_ident_tt"><tt>ident</tt></h4>
+<div class="para"><p>When the attribute <tt>ident</tt> is set to a path, git replaces
<tt>$Id$</tt> in the blob object with <tt>$Id:</tt>, followed by
40-character hexadecimal blob object name, followed by a dollar
sign <tt>$</tt> upon checkout. Any byte sequence that begins with
<tt>$Id:</tt> and ends with <tt>$</tt> in the worktree file is replaced
-with <tt>$Id$</tt> upon check-in.</p>
-<h4><tt>filter</tt></h4>
-<p>A <tt>filter</tt> attribute can be set to a string value that names a
-filter driver specified in the configuration.</p>
-<p>A filter driver consists of a <tt>clean</tt> command and a <tt>smudge</tt>
+with <tt>$Id$</tt> upon check-in.</p></div>
+<h4 id="_tt_filter_tt"><tt>filter</tt></h4>
+<div class="para"><p>A <tt>filter</tt> attribute can be set to a string value that names a
+filter driver specified in the configuration.</p></div>
+<div class="para"><p>A filter driver consists of a <tt>clean</tt> command and a <tt>smudge</tt>
command, either of which can be left unspecified. Upon
checkout, when the <tt>smudge</tt> command is specified, the command is
fed the blob object from its standard input, and its standard
output is used to update the worktree file. Similarly, the
<tt>clean</tt> command is used to convert the contents of worktree file
-upon checkin.</p>
-<p>A missing filter driver definition in the config is not an error
-but makes the filter a no-op passthru.</p>
-<p>The content filtering is done to massage the content into a
+upon checkin.</p></div>
+<div class="para"><p>A missing filter driver definition in the config is not an error
+but makes the filter a no-op passthru.</p></div>
+<div class="para"><p>The content filtering is done to massage the content into a
shape that is more convenient for the platform, filesystem, and
the user to use. The key phrase here is "more convenient" and not
"turning something unusable into usable". In other words, the
intent is that if someone unsets the filter driver definition,
or does not have the appropriate filter program, the project
-should still be usable.</p>
-<h4>Interaction between checkin/checkout attributes</h4>
-<p>In the check-in codepath, the worktree file is first converted
+should still be usable.</p></div>
+<h4 id="_interaction_between_checkin_checkout_attributes">Interaction between checkin/checkout attributes</h4>
+<div class="para"><p>In the check-in codepath, the worktree file is first converted
with <tt>filter</tt> driver (if specified and corresponding driver
defined), then the result is processed with <tt>ident</tt> (if
specified), and then finally with <tt>crlf</tt> (again, if specified
-and applicable).</p>
-<p>In the check-out codepath, the blob content is first converted
-with <tt>crlf</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p>
-<h3>Generating diff text</h3>
-<p>The attribute <tt>diff</tt> affects if <tt>git-diff</tt> generates textual
+and applicable).</p></div>
+<div class="para"><p>In the check-out codepath, the blob content is first converted
+with <tt>crlf</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p></div>
+<h3 id="_generating_diff_text">Generating diff text</h3><div style="clear:left"></div>
+<div class="para"><p>The attribute <tt>diff</tt> affects if <em>git-diff</em> generates textual
patch for the path or just says <tt>Binary files differ</tt>. It also
can affect what line is shown on the hunk header <tt>@@ -k,l +n,m @@</tt>
-line.</p>
-<dl>
+line.</p></div>
+<div class="vlist"><dl>
<dt>
Set
</dt>
@@ -530,72 +578,72 @@ String selection.
</p>
</dd>
-</dl>
-<h4>Defining a custom diff driver</h4>
-<p>The definition of a diff driver is done in <tt>gitconfig</tt>, not
+</dl></div>
+<h4 id="_defining_a_custom_diff_driver">Defining a custom diff driver</h4>
+<div class="para"><p>The definition of a diff driver is done in <tt>gitconfig</tt>, not
<tt>gitattributes</tt> file, so strictly speaking this manual page is a
-wrong place to talk about it. However…</p>
-<p>To define a custom diff driver <tt>jcdiff</tt>, add a section to your
-<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p>
+wrong place to talk about it. However…</p></div>
+<div class="para"><p>To define a custom diff driver <tt>jcdiff</tt>, add a section to your
+<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[diff "jcdiff"]
command = j-c-diff</tt></pre>
</div></div>
-<p>When git needs to show you a diff for the path with <tt>diff</tt>
+<div class="para"><p>When git needs to show you a diff for the path with <tt>diff</tt>
attribute set to <tt>jcdiff</tt>, it calls the command you specified
with the above configuration, i.e. <tt>j-c-diff</tt>, with 7
parameters, just like <tt>GIT_EXTERNAL_DIFF</tt> program is called.
-See <a href="git.html">git(1)</a> for details.</p>
-<h4>Defining a custom hunk-header</h4>
-<p>Each group of changes (called "hunk") in the textual diff output
-is prefixed with a line of the form:</p>
+See <a href="git.html">git(1)</a> for details.</p></div>
+<h4 id="_defining_a_custom_hunk_header">Defining a custom hunk-header</h4>
+<div class="para"><p>Each group of changes (called "hunk") in the textual diff output
+is prefixed with a line of the form:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>@@ -k,l +n,m @@ TEXT</tt></pre>
</div></div>
-<p>The text is called <em>hunk header</em>, and by default a line that
+<div class="para"><p>The text is called <em>hunk header</em>, and by default a line that
begins with an alphabet, an underscore or a dollar sign is used,
-which matches what GNU <tt>diff -p</tt> output uses. This default
+which matches what GNU <em>diff -p</em> output uses. This default
selection however is not suited for some contents, and you can
-use customized pattern to make a selection.</p>
-<p>First in .gitattributes, you would assign the <tt>diff</tt> attribute
-for paths.</p>
+use customized pattern to make a selection.</p></div>
+<div class="para"><p>First in .gitattributes, you would assign the <tt>diff</tt> attribute
+for paths.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>*.tex diff=tex</tt></pre>
</div></div>
-<p>Then, you would define "diff.tex.funcname" configuration to
+<div class="para"><p>Then, you would define "diff.tex.funcname" configuration to
specify a regular expression that matches a line that you would
-want to appear as the hunk header, like this:</p>
+want to appear as the hunk header, like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[diff "tex"]
funcname = "^\\(\\\\\\(sub\\)*section{.*\\)$"</tt></pre>
</div></div>
-<p>Note. A single level of backslashes are eaten by the
+<div class="para"><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 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>
+<tt>section</tt> followed by open brace, to the end of line.</p></div>
+<div class="para"><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
configuration file (you still need to enable this with the
attribute mechanism, via <tt>.gitattributes</tt>). Another built-in
pattern is defined for <tt>java</tt> that defines a pattern suitable
-for program text in Java language.</p>
-<h3>Performing a three-way merge</h3>
-<p>The attribute <tt>merge</tt> affects how three versions of a file is
+for program text in Java language.</p></div>
+<h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>
+<div class="para"><p>The attribute <tt>merge</tt> affects how three versions of a file is
merged when a file-level merge is necessary during <tt>git merge</tt>,
-and other programs such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p>
-<dl>
+and other programs such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p></div>
+<div class="vlist"><dl>
<dt>
Set
</dt>
<dd>
<p>
Built-in 3-way merge driver is used to merge the
- contents in a way similar to <tt>merge</tt> command of <tt>RCS</tt>
+ contents in a way similar to <em>merge</em> command of <tt>RCS</tt>
suite. This is suitable for ordinary text files.
</p>
</dd>
@@ -634,11 +682,11 @@ String requested with "binary".
</p>
</dd>
-</dl>
-<h4>Built-in merge drivers</h4>
-<p>There are a few built-in low-level merge drivers defined that
-can be asked for via the <tt>merge</tt> attribute.</p>
-<dl>
+</dl></div>
+<h4 id="_built_in_merge_drivers">Built-in merge drivers</h4>
+<div class="para"><p>There are a few built-in low-level merge drivers defined that
+can be asked for via the <tt>merge</tt> attribute.</p></div>
+<div class="vlist"><dl>
<dt>
text
</dt>
@@ -675,13 +723,13 @@ union understand the implications.
</p>
</dd>
-</dl>
-<h4>Defining a custom merge driver</h4>
-<p>The definition of a merge driver is done in the <tt>.git/config</tt>
+</dl></div>
+<h4 id="_defining_a_custom_merge_driver">Defining a custom merge driver</h4>
+<div class="para"><p>The definition of a merge driver is done in the <tt>.git/config</tt>
file, not in the <tt>gitattributes</tt> file, so strictly speaking this
-manual page is a wrong place to talk about it. However…</p>
-<p>To define a custom merge driver <tt>filfre</tt>, add a section to your
-<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p>
+manual page is a wrong place to talk about it. However…</p></div>
+<div class="para"><p>To define a custom merge driver <tt>filfre</tt>, add a section to your
+<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>[merge "filfre"]
@@ -689,30 +737,30 @@ manual page is a wrong place to talk about it. However…</p> driver = filfre %O %A %B
recursive = binary</tt></pre>
</div></div>
-<p>The <tt>merge.*.name</tt> variable gives the driver a human-readable
-name.</p>
-<p>The <tt>merge.*.driver</tt> variable's value is used to construct a
+<div class="para"><p>The <tt>merge.*.name</tt> variable gives the driver a human-readable
+name.</p></div>
+<div class="para"><p>The <tt>merge.*.driver</tt> variable's value is used to construct a
command to run to merge ancestor's version (<tt>%O</tt>), current
version (<tt>%A</tt>) and the other branches' version (<tt>%B</tt>). These
three tokens are replaced with the names of temporary files that
hold the contents of these versions when the command line is
-built.</p>
-<p>The merge driver is expected to leave the result of the merge in
+built.</p></div>
+<div class="para"><p>The merge driver is expected to leave the result of the merge in
the file named with <tt>%A</tt> by overwriting it, and exit with zero
status if it managed to merge them cleanly, or non-zero if there
-were conflicts.</p>
-<p>The <tt>merge.*.recursive</tt> variable specifies what other merge
+were conflicts.</p></div>
+<div class="para"><p>The <tt>merge.*.recursive</tt> variable specifies what other merge
driver to use when the merge driver is called for an internal
merge between common ancestors, when there are more than one.
When left unspecified, the driver itself is used for both
-internal merge and the final merge.</p>
-<h3>Checking whitespace errors</h3>
-<h4><tt>whitespace</tt></h4>
-<p>The <tt>core.whitespace</tt> configuration variable allows you to define what
-<tt>diff</tt> and <tt>apply</tt> should consider whitespace errors for all paths in
+internal merge and the final merge.</p></div>
+<h3 id="_checking_whitespace_errors">Checking whitespace errors</h3><div style="clear:left"></div>
+<h4 id="_tt_whitespace_tt"><tt>whitespace</tt></h4>
+<div class="para"><p>The <tt>core.whitespace</tt> configuration variable allows you to define what
+<em>diff</em> and <em>apply</em> should consider whitespace errors for all paths in
the project (See <a href="git-config.html">git-config(1)</a>). This attribute gives you finer
-control per path.</p>
-<dl>
+control per path.</p></div>
+<div class="vlist"><dl>
<dt>
Set
</dt>
@@ -748,11 +796,25 @@ String variable.
</p>
</dd>
-</dl>
+</dl></div>
+<h3 id="_creating_an_archive">Creating an archive</h3><div style="clear:left"></div>
+<h4 id="_tt_export_ignore_tt"><tt>export-ignore</tt></h4>
+<div class="para"><p>Files and directories with the attribute <tt>export-ignore</tt> won't be added to
+archive files.</p></div>
+<h4 id="_tt_export_subst_tt"><tt>export-subst</tt></h4>
+<div class="para"><p>If the attribute <tt>export-subst</tt> is set for a file then git will expand
+several placeholders when adding this file to an archive. The
+expansion depends on the availability of a commit ID, i.e., if
+<a href="git-archive.html">git-archive(1)</a> has been given a tree instead of a commit or a
+tag then no replacement will be done. The placeholders are the same
+as those for the option <tt>--pretty=format:</tt> of <a href="git-log.html">git-log(1)</a>,
+except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt>
+in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the
+commit hash.</p></div>
</div>
-<h2>EXAMPLE</h2>
+<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
-<p>If you have these three <tt>gitattributes</tt> file:</p>
+<div class="para"><p>If you have these three <tt>gitattributes</tt> file:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>(in $GIT_DIR/info/attributes)
@@ -767,8 +829,8 @@ ab* merge=filfre abc -foo -bar
*.c frotz</tt></pre>
</div></div>
-<p>the attributes given to path <tt>t/abc</tt> are computed as follows:</p>
-<ol>
+<div class="para"><p>the attributes given to path <tt>t/abc</tt> are computed as follows:</p></div>
+<div class="olist"><ol>
<li>
<p>
By examining <tt>t/.gitattributes</tt> (which is in the same
@@ -795,8 +857,8 @@ Finally it examines <tt>$GIT_DIR/info/attributes</tt>. This file state, and <tt>baz</tt> is unset.
</p>
</li>
-</ol>
-<p>As the result, the attributes assignment to <tt>t/abc</tt> becomes:</p>
+</ol></div>
+<div class="para"><p>As the result, the attributes assignment to <tt>t/abc</tt> becomes:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>foo set to true
@@ -805,28 +867,14 @@ baz set to false merge set to string value "filfre"
frotz unspecified</tt></pre>
</div></div>
-<h3>Creating an archive</h3>
-<h4><tt>export-ignore</tt></h4>
-<p>Files and directories with the attribute <tt>export-ignore</tt> won't be added to
-archive files.</p>
-<h4><tt>export-subst</tt></h4>
-<p>If the attribute <tt>export-subst</tt> is set for a file then git will expand
-several placeholders when adding this file to an archive. The
-expansion depends on the availability of a commit ID, i.e., if
-<tt>git-archive</tt> has been given a tree instead of a commit or a
-tag then no replacement will be done. The placeholders are the same
-as those for the option <tt>--pretty=format:</tt> of <a href="git-log.html">git-log(1)</a>,
-except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt>
-in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the
-commit hash.</p>
</div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:02:09 UTC
+Last updated 2008-07-06 05:17:09 UTC
</div>
</div>
</body>
|