diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-13 08:31:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-13 08:31:58 +0000 |
| commit | eef01fe919cb245838e4f4ad512a66202747742e (patch) | |
| tree | 02c72b987c74aadbce61763a2e2772bde48b416a /gitattributes.html | |
| parent | cf29d337e34d752e5b61fc6629294eccc3ff6ef3 (diff) | |
| download | git-htmldocs-eef01fe919cb245838e4f4ad512a66202747742e.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-557-gb5c17
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 412 |
1 files changed, 254 insertions, 158 deletions
diff --git a/gitattributes.html b/gitattributes.html index fdaeea3c4..8b5a34c50 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -3,7 +3,8 @@ <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 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>gitattributes(5)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
-div.hlist {
+
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
}
-td.hlist1 {
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>gitattributes(5)</title>
</head>
<body>
<div id="header">
@@ -318,26 +412,26 @@ gitattributes(5) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p>$GIT_DIR/info/attributes, .gitattributes</p></div>
+<div class="paragraph"><p>$GIT_DIR/info/attributes, .gitattributes</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>A <tt>gitattributes</tt> file is a simple text file that gives
+<div class="paragraph"><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="paragraph"><p>Each line in <tt>gitattributes</tt> file is of form:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>pattern attr1 attr2 ...</tt></pre>
</div></div>
-<div class="para"><p>That is, a pattern followed by an attributes list,
+<div class="paragraph"><p>That is, a pattern followed by an attributes list,
separated by whitespaces. When the pattern matches the
path in question, the attributes listed on the line are given to
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>
+<div class="paragraph"><p>Each attribute can be in one of these states for a given path:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Set
</dt>
<dd>
@@ -347,7 +441,7 @@ Set attribute in the attribute list.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unset
</dt>
<dd>
@@ -357,7 +451,7 @@ Unset prefixed with a dash <tt>-</tt> in the attribute list.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Set to a value
</dt>
<dd>
@@ -368,7 +462,7 @@ Set to a value attribute list.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unspecified
</dt>
<dd>
@@ -379,11 +473,11 @@ Unspecified </p>
</dd>
</dl></div>
-<div class="para"><p>When more than one pattern matches the path, a later line
+<div class="paragraph"><p>When more than one pattern matches the path, a later line
overrides an earlier line. This overriding is done per
attribute. The rules how the pattern matches paths are the
same as in <tt>.gitignore</tt> files; see <a href="gitignore.html">gitignore(5)</a>.</p></div>
-<div class="para"><p>When deciding what attributes are assigned to a path, git
+<div class="paragraph"><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 up to the toplevel of the
@@ -391,9 +485,9 @@ work tree (the further the directory that contains <tt>.gitattributes</tt> is from the path in question, the lower its precedence). Finally
global and system-wide files are considered (they have the lowest
precedence).</p></div>
-<div class="para"><p>If you wish to affect only a single repository (i.e., to assign
+<div class="paragraph"><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 for that repository), then
+one user’s workflow for that repository), 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
@@ -402,29 +496,29 @@ for a single user should be placed in a file specified by the <tt>core.attributesfile</tt> configuration option (see <a href="git-config.html">git-config(1)</a>).
Attributes for all users on a system should be placed in the
<tt>$(prefix)/etc/gitattributes</tt> file.</p></div>
-<div class="para"><p>Sometimes you would need to override an setting of an attribute
+<div class="paragraph"><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></div>
</div>
<h2 id="_effects">EFFECTS</h2>
<div class="sectionbody">
-<div class="para"><p>Certain operations by git can be influenced by assigning
+<div class="paragraph"><p>Certain operations by git can be influenced by assigning
particular attributes to a path. Currently, the following
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
+<div class="paragraph"><p>These attributes affect how the contents stored in the
repository are copied to the working tree files when commands
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 <em>git add</em> and <em>git commit</em>.</p></div>
<h4 id="_tt_text_tt"><tt>text</tt></h4>
-<div class="para"><p>This attribute enables and controls end-of-line normalization. When a
+<div class="paragraph"><p>This attribute enables and controls end-of-line normalization. When a
text file is normalized, its line endings are converted to LF in the
repository. To control what line ending style is used in the working
directory, use the <tt>eol</tt> attribute for a single file and the
<tt>core.eol</tt> configuration variable for all text files.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Set
</dt>
<dd>
@@ -434,7 +528,7 @@ Set conversion takes place without guessing the content type.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unset
</dt>
<dd>
@@ -443,7 +537,7 @@ Unset attempt any end-of-line conversion upon checkin or checkout.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Set to string value "auto"
</dt>
<dd>
@@ -453,7 +547,7 @@ Set to string value "auto" text, its line endings are normalized to LF on checkin.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unspecified
</dt>
<dd>
@@ -464,14 +558,14 @@ Unspecified </p>
</dd>
</dl></div>
-<div class="para"><p>Any other value causes git to act as if <tt>text</tt> has been left
+<div class="paragraph"><p>Any other value causes git to act as if <tt>text</tt> has been left
unspecified.</p></div>
<h4 id="_tt_eol_tt"><tt>eol</tt></h4>
-<div class="para"><p>This attribute sets a specific line-ending style to be used in the
+<div class="paragraph"><p>This attribute sets a specific line-ending style to be used in the
working directory. It enables end-of-line normalization without any
content checks, effectively setting the <tt>text</tt> attribute.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Set to string value "crlf"
</dt>
<dd>
@@ -481,7 +575,7 @@ Set to string value "crlf" checked out.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Set to string value "lf"
</dt>
<dd>
@@ -493,7 +587,7 @@ Set to string value "lf" </dd>
</dl></div>
<h4 id="_backwards_compatibility_with_tt_crlf_tt_attribute">Backwards compatibility with <tt>crlf</tt> attribute</h4>
-<div class="para"><p>For backwards compatibility, the <tt>crlf</tt> attribute is interpreted as
+<div class="paragraph"><p>For backwards compatibility, the <tt>crlf</tt> attribute is interpreted as
follows:</p></div>
<div class="listingblock">
<div class="content">
@@ -502,10 +596,10 @@ follows:</p></div> crlf=input eol=lf</tt></pre>
</div></div>
<h4 id="_end_of_line_conversion">End-of-line conversion</h4>
-<div class="para"><p>While git normally leaves file contents alone, it can be configured to
+<div class="paragraph"><p>While git normally leaves file contents alone, it can be configured to
normalize line endings to LF in the repository and, optionally, to
convert them to CRLF when files are checked out.</p></div>
-<div class="para"><p>Here is an example that will make git normalize .txt, .vcproj and .sh
+<div class="paragraph"><p>Here is an example that will make git normalize .txt, .vcproj and .sh
files, ensure that .vcproj files have CRLF and .sh files have LF in
the working directory, and prevent .jpg files from being normalized
regardless of their content.</p></div>
@@ -516,10 +610,10 @@ regardless of their content.</p></div> *.sh eol=lf
*.jpg -text</tt></pre>
</div></div>
-<div class="para"><p>Other source code management systems normalize all text files in their
+<div class="paragraph"><p>Other source code management systems normalize all text files in their
repositories, and there are two ways to enable similar automatic
normalization in git.</p></div>
-<div class="para"><p>If you simply want to have CRLF line endings in your working directory
+<div class="paragraph"><p>If you simply want to have CRLF line endings in your working directory
regardless of the repository you are working with, you can set the
config variable "core.autocrlf" without changing any attributes.</p></div>
<div class="listingblock">
@@ -527,19 +621,19 @@ config variable "core.autocrlf" without changing any attributes.</p></div> <pre><tt>[core]
autocrlf = true</tt></pre>
</div></div>
-<div class="para"><p>This does not force normalization of all text files, but does ensure
+<div class="paragraph"><p>This does not force normalization of all text files, but does ensure
that text files that you introduce to the repository have their line
endings normalized to LF when they are added, and that files that are
already normalized in the repository stay normalized.</p></div>
-<div class="para"><p>If you want to interoperate with a source code management system that
+<div class="paragraph"><p>If you want to interoperate with a source code management system that
enforces end-of-line normalization, or you simply want all text files
in your repository to be normalized, you should instead set the <tt>text</tt>
-attribute to "auto" for _all_ files.</p></div>
+attribute to "auto" for <em>all</em> files.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>* text=auto</tt></pre>
</div></div>
-<div class="para"><p>This ensures that all files that git considers to be text will have
+<div class="paragraph"><p>This ensures that all files that git considers to be text will have
normalized (LF) line endings in the repository. The <tt>core.eol</tt>
configuration variable controls which line endings git will use for
normalized files in your working directory; the default is to use the
@@ -567,26 +661,26 @@ $ git add -u $ git add .gitattributes
$ git commit -m "Introduce end-of-line normalization"</tt></pre>
</div></div>
-<div class="para"><p>If any files that should not be normalized show up in <em>git status</em>,
+<div class="paragraph"><p>If any files that should not be normalized show up in <em>git status</em>,
unset their <tt>text</tt> attribute before running <em>git add -u</em>.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>manual.pdf -text</tt></pre>
</div></div>
-<div class="para"><p>Conversely, text files that git does not detect can have normalization
+<div class="paragraph"><p>Conversely, text files that git does not detect can have normalization
enabled manually.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>weirdchars.txt text</tt></pre>
</div></div>
-<div class="para"><p>If <tt>core.safecrlf</tt> is set to "true" or "warn", git verifies if
+<div class="paragraph"><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></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
<em>git add</em> itself does not touch the files in the work tree, the
@@ -610,38 +704,38 @@ few exceptions. Even though…</p></div> </li>
</ul></div>
<h4 id="_tt_ident_tt"><tt>ident</tt></h4>
-<div class="para"><p>When the attribute <tt>ident</tt> is set for a path, git replaces
+<div class="paragraph"><p>When the attribute <tt>ident</tt> is set for a path, git replaces
<tt>$Id$</tt> in the blob object with <tt>$Id:</tt>, followed by the
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></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
+<div class="paragraph"><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>
+<div class="paragraph"><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></div>
-<div class="para"><p>A missing filter driver definition in the config is not an error
+<div class="paragraph"><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
+<div class="paragraph"><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></div>
-<div class="para"><p>For example, in .gitattributes, you would assign the <tt>filter</tt>
+<div class="paragraph"><p>For example, in .gitattributes, you would assign the <tt>filter</tt>
attribute for paths.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>*.c filter=indent</tt></pre>
</div></div>
-<div class="para"><p>Then you would define a "filter.indent.clean" and "filter.indent.smudge"
+<div class="paragraph"><p>Then you would define a "filter.indent.clean" and "filter.indent.smudge"
configuration in your .git/config to specify a pair of commands to
modify the contents of C programs when the source files are checked
in ("clean" is run) and checked out (no change is made because the
@@ -652,50 +746,50 @@ command is "cat").</p></div> clean = indent
smudge = cat</tt></pre>
</div></div>
-<div class="para"><p>For best results, <tt>clean</tt> should not alter its output further if it is
-run twice ("clean->clean" should be equivalent to "clean"), and
+<div class="paragraph"><p>For best results, <tt>clean</tt> should not alter its output further if it is
+run twice ("clean→clean" should be equivalent to "clean"), and
multiple <tt>smudge</tt> commands should not alter <tt>clean</tt>'s output
-("smudge->smudge->clean" should be equivalent to "clean"). See the
+("smudge→smudge→clean" should be equivalent to "clean"). See the
section on merging below.</p></div>
-<div class="para"><p>The "indent" filter is well-behaved in this regard: it will not modify
+<div class="paragraph"><p>The "indent" filter is well-behaved in this regard: it will not modify
input that is already correctly indented. In this case, the lack of a
-smudge filter means that the clean filter _must_ accept its own output
+smudge filter means that the clean filter <em>must</em> accept its own output
without modifying it.</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
+<div class="paragraph"><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>text</tt> (again, if specified
and applicable).</p></div>
-<div class="para"><p>In the check-out codepath, the blob content is first converted
+<div class="paragraph"><p>In the check-out codepath, the blob content is first converted
with <tt>text</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p></div>
<h4 id="_merging_branches_with_differing_checkin_checkout_attributes">Merging branches with differing checkin/checkout attributes</h4>
-<div class="para"><p>If you have added attributes to a file that cause the canonical
+<div class="paragraph"><p>If you have added attributes to a file that cause the canonical
repository format for that file to change, such as adding a
clean/smudge filter or text/eol/ident attributes, merging anything
where the attribute is not in place would normally cause merge
conflicts.</p></div>
-<div class="para"><p>To prevent these unnecessary merge conflicts, git can be told to run a
+<div class="paragraph"><p>To prevent these unnecessary merge conflicts, git can be told to run a
virtual check-out and check-in of all three stages of a file when
resolving a three-way merge by setting the <tt>merge.renormalize</tt>
configuration variable. This prevents changes caused by check-in
conversion from causing spurious merge conflicts when a converted file
is merged with an unconverted file.</p></div>
-<div class="para"><p>As long as a "smudge->clean" results in the same output as a "clean"
+<div class="paragraph"><p>As long as a "smudge→clean" results in the same output as a "clean"
even on files that are already smudged, this strategy will
automatically resolve all filter-related conflicts. Filters that do
not act in this way may cause additional merge conflicts that must be
resolved manually.</p></div>
<h3 id="_generating_diff_text">Generating diff text</h3><div style="clear:left"></div>
<h4 id="_tt_diff_tt"><tt>diff</tt></h4>
-<div class="para"><p>The attribute <tt>diff</tt> affects how <em>git</em> generates diffs for particular
+<div class="paragraph"><p>The attribute <tt>diff</tt> affects how <em>git</em> generates diffs for particular
files. It can tell git whether to generate a textual patch for the path
or to treat the path as a binary file. It can also affect what line is
shown on the hunk header <tt>@@ -k,l +n,m @@</tt> line, tell git to use an
external command to generate the diff, or ask git to convert binary
files to a text format before generating the diff.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Set
</dt>
<dd>
@@ -705,7 +799,7 @@ Set normally never appear in text files, such as NUL.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unset
</dt>
<dd>
@@ -715,7 +809,7 @@ Unset binary patches are enabled).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unspecified
</dt>
<dd>
@@ -726,7 +820,7 @@ Unspecified generate <tt>Binary files differ</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
String
</dt>
<dd>
@@ -740,40 +834,40 @@ String </dd>
</dl></div>
<h4 id="_defining_an_external_diff_driver">Defining an external diff driver</h4>
-<div class="para"><p>The definition of a diff driver is done in <tt>gitconfig</tt>, not
+<div class="paragraph"><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></div>
-<div class="para"><p>To define an external diff driver <tt>jcdiff</tt>, add a section to your
+<div class="paragraph"><p>To define an external 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>
-<div class="para"><p>When git needs to show you a diff for the path with <tt>diff</tt>
+<div class="paragraph"><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></div>
<h4 id="_defining_a_custom_hunk_header">Defining a custom hunk-header</h4>
-<div class="para"><p>Each group of changes (called a "hunk") in the textual diff output
+<div class="paragraph"><p>Each group of changes (called a "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>
-<div class="para"><p>This is called a <em>hunk header</em>. The "TEXT" portion is by default a line
+<div class="paragraph"><p>This is called a <em>hunk header</em>. The "TEXT" portion is by default a line
that begins with an alphabet, an underscore or a dollar sign; this
matches what GNU <em>diff -p</em> output uses. This default selection however
is not suited for some contents, and you can use a customized pattern
to make a selection.</p></div>
-<div class="para"><p>First, in .gitattributes, you would assign the <tt>diff</tt> attribute
+<div class="paragraph"><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>
-<div class="para"><p>Then, you would define a "diff.tex.xfuncname" configuration to
+<div class="paragraph"><p>Then, you would define a "diff.tex.xfuncname" configuration to
specify a regular expression that matches a line that you would
want to appear as the hunk header "TEXT". Add a section to your
<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file) like this:</p></div>
@@ -782,17 +876,17 @@ want to appear as the hunk header "TEXT". Add a section to your <pre><tt>[diff "tex"]
xfuncname = "^(\\\\(sub)*section\\{.*)$"</tt></pre>
</div></div>
-<div class="para"><p>Note. A single level of backslashes are eaten by the
+<div class="paragraph"><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></div>
-<div class="para"><p>There are a few built-in patterns to make this easier, and <tt>tex</tt>
+<div class="paragraph"><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>). The following built in
patterns are available:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
<tt>bibtex</tt> suitable for files with BibTeX coded references.
@@ -855,7 +949,7 @@ patterns are available:</p></div> </li>
</ul></div>
<h4 id="_customizing_word_diff">Customizing word diff</h4>
-<div class="para"><p>You can customize the rules that <tt>git diff --word-diff</tt> uses to
+<div class="paragraph"><p>You can customize the rules that <tt>git diff --word-diff</tt> uses to
split words in a line, by specifying an appropriate regular expression
in the "diff.*.wordRegex" configuration variable. For example, in TeX
a backslash followed by a sequence of letters forms a command, but
@@ -867,20 +961,20 @@ whitespace. To separate them, use a regular expression in your <pre><tt>[diff "tex"]
wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"</tt></pre>
</div></div>
-<div class="para"><p>A built-in pattern is provided for all languages listed in the
+<div class="paragraph"><p>A built-in pattern is provided for all languages listed in the
previous section.</p></div>
<h4 id="_performing_text_diffs_of_binary_files">Performing text diffs of binary files</h4>
-<div class="para"><p>Sometimes it is desirable to see the diff of a text-converted
+<div class="paragraph"><p>Sometimes it is desirable to see the diff of a text-converted
version of some binary files. For example, a word processor
document can be converted to an ASCII text representation, and
the diff of the text shown. Even though this conversion loses
some information, the resulting diff is useful for human
viewing (but cannot be applied directly).</p></div>
-<div class="para"><p>The <tt>textconv</tt> config option is used to define a program for
+<div class="paragraph"><p>The <tt>textconv</tt> config option is used to define a program for
performing such a conversion. The program should take a single
argument, the name of a file to convert, and produce the
resulting text on stdout.</p></div>
-<div class="para"><p>For example, to show the diff of the exif information of a
+<div class="paragraph"><p>For example, to show the diff of the exif information of a
file instead of the binary information (assuming you have the
exif tool installed), add the following section to your
<tt>$GIT_DIR/config</tt> file (or <tt>$HOME/.gitconfig</tt> file):</p></div>
@@ -897,20 +991,20 @@ exif tool installed), add the following section to your <td class="content">The text conversion is generally a one-way conversion;
in this example, we lose the actual image contents and focus
just on the text data. This means that diffs generated by
-textconv are _not_ suitable for applying. For this reason,
+textconv are <em>not</em> suitable for applying. For this reason,
only <tt>git diff</tt> and the <tt>git log</tt> family of commands (i.e.,
log, whatchanged, show) will perform text conversion. <tt>git
format-patch</tt> will never generate this output. If you want to
send somebody a text-converted diff of a binary file (e.g.,
because it quickly conveys the changes you have made), you
-should generate it separately and send it as a comment _in
-addition to_ the usual binary diff that you might send.</td>
+should generate it separately and send it as a comment <em>in
+addition to</em> the usual binary diff that you might send.</td>
</tr></table>
</div>
-<div class="para"><p>Because text conversion can be slow, especially when doing a
+<div class="paragraph"><p>Because text conversion can be slow, especially when doing a
large number of them with <tt>git log -p</tt>, git provides a mechanism
to cache the output and use it in future diffs. To enable
-caching, set the "cachetextconv" variable in your diff driver's
+caching, set the "cachetextconv" variable in your diff driver’s
config. For example:</p></div>
<div class="listingblock">
<div class="content">
@@ -918,7 +1012,7 @@ config. For example:</p></div> textconv = exif
cachetextconv = true</tt></pre>
</div></div>
-<div class="para"><p>This will cache the result of running "exif" on each blob
+<div class="paragraph"><p>This will cache the result of running "exif" on each blob
indefinitely. If you change the textconv config variable for a
diff driver, git will automatically invalidate the cache entries
and re-run the textconv filter. If you want to invalidate the
@@ -928,11 +1022,11 @@ manually with <tt>git update-ref -d refs/notes/textconv/jpg</tt> (where "jpg" is the name of the diff driver, as in the example above).</p></div>
<h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>
<h4 id="_tt_merge_tt"><tt>merge</tt></h4>
-<div class="para"><p>The attribute <tt>merge</tt> affects how three versions of a file is
+<div class="paragraph"><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 commands such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Set
</dt>
<dd>
@@ -942,7 +1036,7 @@ Set suite. This is suitable for ordinary text files.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unset
</dt>
<dd>
@@ -953,7 +1047,7 @@ Unset not have a well-defined merge semantics.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unspecified
</dt>
<dd>
@@ -965,7 +1059,7 @@ Unspecified <tt>merge</tt> attribute is unspecified.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
String
</dt>
<dd>
@@ -979,10 +1073,10 @@ String </dd>
</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
+<div class="paragraph"><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>
+<div class="dlist"><dl>
+<dt class="hdlist1">
text
</dt>
<dd>
@@ -995,7 +1089,7 @@ text marker.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
binary
</dt>
<dd>
@@ -1005,7 +1099,7 @@ binary sort out.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
union
</dt>
<dd>
@@ -1020,10 +1114,10 @@ union </dd>
</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>
+<div class="paragraph"><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></div>
-<div class="para"><p>To define a custom merge driver <tt>filfre</tt>, add a section to your
+<div class="paragraph"><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">
@@ -1032,29 +1126,29 @@ manual page is a wrong place to talk about it. However…</p></div> driver = filfre %O %A %B
recursive = binary</tt></pre>
</div></div>
-<div class="para"><p>The <tt>merge.*.name</tt> variable gives the driver a human-readable
+<div class="paragraph"><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
+<div class="paragraph"><p>The ‘merge.*.driver` 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. Additionally, %L will be replaced with the conflict marker
size (see below).</p></div>
-<div class="para"><p>The merge driver is expected to leave the result of the merge in
+<div class="paragraph"><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></div>
-<div class="para"><p>The <tt>merge.*.recursive</tt> variable specifies what other merge
+<div class="paragraph"><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></div>
<h4 id="_tt_conflict_marker_size_tt"><tt>conflict-marker-size</tt></h4>
-<div class="para"><p>This attribute controls the length of conflict markers left in
+<div class="paragraph"><p>This attribute controls the length of conflict markers left in
the work tree file during a conflicted merge. Only setting to
the value to a positive integer has any meaningful effect.</p></div>
-<div class="para"><p>For example, this line in <tt>.gitattributes</tt> can be used to tell the merge
+<div class="paragraph"><p>For example, this line in <tt>.gitattributes</tt> can be used to tell the merge
machinery to leave much longer (instead of the usual 7-character-long)
conflict markers when merging the file <tt>Documentation/git-merge.txt</tt>
results in a conflict.</p></div>
@@ -1064,20 +1158,22 @@ results in a conflict.</p></div> </div></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
+<div class="paragraph"><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></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Set
</dt>
<dd>
<p>
Notice all types of potential whitespace errors known to git.
+ The tab width is taken from the value of the <tt>core.whitespace</tt>
+ configuration variable.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unset
</dt>
<dd>
@@ -1085,32 +1181,32 @@ Unset Do not notice anything as error.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Unspecified
</dt>
<dd>
<p>
- Use the value of <tt>core.whitespace</tt> configuration variable to
+ Use the value of the <tt>core.whitespace</tt> configuration variable to
decide what to notice as error.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
String
</dt>
<dd>
<p>
Specify a comma separate list of common whitespace problems to
- notice in the same format as <tt>core.whitespace</tt> configuration
+ notice in the same format as the <tt>core.whitespace</tt> configuration
variable.
</p>
</dd>
</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
+<div class="paragraph"><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
+<div class="paragraph"><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
@@ -1121,41 +1217,41 @@ in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the commit hash.</p></div>
<h3 id="_packing_objects">Packing objects</h3><div style="clear:left"></div>
<h4 id="_tt_delta_tt"><tt>delta</tt></h4>
-<div class="para"><p>Delta compression will not be attempted for blobs for paths with the
+<div class="paragraph"><p>Delta compression will not be attempted for blobs for paths with the
attribute <tt>delta</tt> set to false.</p></div>
<h3 id="_viewing_files_in_gui_tools">Viewing files in GUI tools</h3><div style="clear:left"></div>
<h4 id="_tt_encoding_tt"><tt>encoding</tt></h4>
-<div class="para"><p>The value of this attribute specifies the character encoding that should
+<div class="paragraph"><p>The value of this attribute specifies the character encoding that should
be used by GUI tools (e.g. <a href="gitk.html">gitk(1)</a> and <a href="git-gui.html">git-gui(1)</a>) to
display the contents of the relevant file. Note that due to performance
considerations <a href="gitk.html">gitk(1)</a> does not use this attribute unless you
manually enable per-file encodings in its options.</p></div>
-<div class="para"><p>If this attribute is not set or has an invalid value, the value of the
+<div class="paragraph"><p>If this attribute is not set or has an invalid value, the value of the
<tt>gui.encoding</tt> configuration variable is used instead
(See <a href="git-config.html">git-config(1)</a>).</p></div>
</div>
<h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2>
<div class="sectionbody">
-<div class="para"><p>You do not want any end-of-line conversions applied to, nor textual diffs
+<div class="paragraph"><p>You do not want any end-of-line conversions applied to, nor textual diffs
produced for, any binary file you track. You would need to specify e.g.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>*.jpg -text -diff</tt></pre>
</div></div>
-<div class="para"><p>but that may become cumbersome, when you have many attributes. Using
+<div class="paragraph"><p>but that may become cumbersome, when you have many attributes. Using
attribute macros, you can specify groups of attributes set or unset at
the same time. The system knows a built-in attribute macro, <tt>binary</tt>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>*.jpg binary</tt></pre>
</div></div>
-<div class="para"><p>which is equivalent to the above. Note that the attribute macros can only
+<div class="paragraph"><p>which is equivalent to the above. Note that the attribute macros can only
be "Set" (see the above example that sets "binary" macro as if it were an
ordinary attribute --- setting it in turn unsets "text" and "diff").</p></div>
</div>
<h2 id="_defining_attribute_macros">DEFINING ATTRIBUTE MACROS</h2>
<div class="sectionbody">
-<div class="para"><p>Custom attribute macros can be defined only in the <tt>.gitattributes</tt> file
+<div class="paragraph"><p>Custom attribute macros can be defined only in the <tt>.gitattributes</tt> file
at the toplevel (i.e. not in any subdirectory). The built-in attribute
macro "binary" is equivalent to:</p></div>
<div class="listingblock">
@@ -1165,7 +1261,7 @@ macro "binary" is equivalent to:</p></div> </div>
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
-<div class="para"><p>If you have these three <tt>gitattributes</tt> file:</p></div>
+<div class="paragraph"><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)
@@ -1180,8 +1276,8 @@ ab* merge=filfre abc -foo -bar
*.c frotz</tt></pre>
</div></div>
-<div class="para"><p>the attributes given to path <tt>t/abc</tt> are computed as follows:</p></div>
-<div class="olist"><ol>
+<div class="paragraph"><p>the attributes given to path <tt>t/abc</tt> are computed as follows:</p></div>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
By examining <tt>t/.gitattributes</tt> (which is in the same
@@ -1209,7 +1305,7 @@ Finally it examines <tt>$GIT_DIR/info/attributes</tt>. This file </p>
</li>
</ol></div>
-<div class="para"><p>As the result, the attributes assignment to <tt>t/abc</tt> becomes:</p></div>
+<div class="paragraph"><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
@@ -1221,11 +1317,11 @@ frotz unspecified</tt></pre> </div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-30 00:03:00 UTC
+Last updated 2010-12-13 08:31:26 UTC
</div>
</div>
</body>
|