diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-apply.html | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 262 |
1 files changed, 179 insertions, 83 deletions
diff --git a/git-apply.html b/git-apply.html index 99d72737e..1be859cdf 100644 --- a/git-apply.html +++ b/git-apply.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>git-apply(1)</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>git-apply(1)</title>
</head>
<body>
<div id="header">
@@ -318,33 +412,35 @@ git-apply(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
+<div class="verseblock-content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
[--ignore-space-change | --ignore-whitespace ]
[--whitespace=(nowarn|warn|fix|error|error-all)]
[--exclude=<path>] [--include=<path>] [--directory=<root>]
- [--verbose] [<patch>…]</div></div>
+ [--verbose] [<patch>…]</div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Reads the supplied diff output (i.e. "a patch") and applies it to files.
+<div class="paragraph"><p>Reads the supplied diff output (i.e. "a patch") and applies it to files.
With the <tt>--index</tt> option the patch is also applied to the index, and
with the <tt>--cache</tt> option the patch is only applied to the index.
Without these options, the command applies the patch only to files,
and does not require them to be in a git repository.</p></div>
-<div class="para"><p>This command applies the patch but does not create a commit. Use
+<div class="paragraph"><p>This command applies the patch but does not create a commit. Use
<a href="git-am.html">git-am(1)</a> to create commits from patches generated by
<a href="git-format-patch.html">git-format-patch(1)</a> and/or received by email.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
<patch>…
</dt>
<dd>
@@ -353,7 +449,7 @@ and does not require them to be in a git repository.</p></div> from the standard input.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--stat
</dt>
<dd>
@@ -362,7 +458,7 @@ and does not require them to be in a git repository.</p></div> input. Turns off "apply".
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--numstat
</dt>
<dd>
@@ -374,7 +470,7 @@ and does not require them to be in a git repository.</p></div> <tt>0 0</tt>. Turns off "apply".
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--summary
</dt>
<dd>
@@ -385,7 +481,7 @@ and does not require them to be in a git repository.</p></div> Turns off "apply".
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--check
</dt>
<dd>
@@ -395,7 +491,7 @@ and does not require them to be in a git repository.</p></div> file and detects errors. Turns off "apply".
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--index
</dt>
<dd>
@@ -409,7 +505,7 @@ and does not require them to be in a git repository.</p></div> causes the index file to be updated.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--cached
</dt>
<dd>
@@ -419,7 +515,7 @@ and does not require them to be in a git repository.</p></div> without using the working tree. This implies <tt>--index</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--build-fake-ancestor=<file>
</dt>
<dd>
@@ -430,13 +526,13 @@ and does not require them to be in a git repository.</p></div> the original versions of the blobs are available locally,
builds a temporary index containing those blobs.
</p>
-<div class="para"><p>When a pure mode change is encountered (which has no index information),
+<div class="paragraph"><p>When a pure mode change is encountered (which has no index information),
the information is read from the current index instead.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-R
</dt>
-<dt>
+<dt class="hdlist1">
--reverse
</dt>
<dd>
@@ -444,7 +540,7 @@ the information is read from the current index instead.</p></div> Apply the patch in reverse.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--reject
</dt>
<dd>
@@ -456,7 +552,7 @@ the information is read from the current index instead.</p></div> rejected hunks in corresponding *.rej files.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-z
</dt>
<dd>
@@ -464,12 +560,12 @@ the information is read from the current index instead.</p></div> When <tt>--numstat</tt> has been given, do not munge pathnames,
but use a NUL-terminated machine-readable format.
</p>
-<div class="para"><p>Without this option, each pathname output will have TAB, LF, double quotes,
+<div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>,
respectively, and the pathname will be enclosed in double quotes if
any of those replacements occurred.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-p<n>
</dt>
<dd>
@@ -478,7 +574,7 @@ any of those replacements occurred.</p></div> default is 1.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-C<n>
</dt>
<dd>
@@ -489,7 +585,7 @@ any of those replacements occurred.</p></div> ever ignored.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--unidiff-zero
</dt>
<dd>
@@ -500,10 +596,10 @@ any of those replacements occurred.</p></div> applying a diff generated with <tt>--unified=0</tt>. To bypass these
checks use <tt>--unidiff-zero</tt>.
</p>
-<div class="para"><p>Note, for the reasons stated above usage of context-free patches is
+<div class="paragraph"><p>Note, for the reasons stated above usage of context-free patches is
discouraged.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--apply
</dt>
<dd>
@@ -515,7 +611,7 @@ discouraged.</p></div> the patch.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-add
</dt>
<dd>
@@ -527,10 +623,10 @@ discouraged.</p></div> deletion part but not the addition part.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--allow-binary-replacement
</dt>
-<dt>
+<dt class="hdlist1">
--binary
</dt>
<dd>
@@ -541,17 +637,17 @@ discouraged.</p></div> patch application, so this is a no-op.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--exclude=<path-pattern>
</dt>
<dd>
<p>
- Don't apply changes to files matching the given path pattern. This can
+ Don’t apply changes to files matching the given path pattern. This can
be useful when importing patchsets, where you want to exclude certain
files or directories.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--include=<path-pattern>
</dt>
<dd>
@@ -560,16 +656,16 @@ discouraged.</p></div> be useful when importing patchsets, where you want to include certain
files or directories.
</p>
-<div class="para"><p>When <tt>--exclude</tt> and <tt>--include</tt> patterns are used, they are examined in the
+<div class="paragraph"><p>When <tt>--exclude</tt> and <tt>--include</tt> patterns are used, they are examined in the
order they appear on the command line, and the first match determines if a
patch to each path is used. A patch to a path that does not match any
include/exclude pattern is used by default if there is no include pattern
on the command line, and ignored if there is any include pattern.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--ignore-space-change
</dt>
-<dt>
+<dt class="hdlist1">
--ignore-whitespace
</dt>
<dd>
@@ -581,7 +677,7 @@ on the command line, and ignored if there is any include pattern.</p></div> <tt>--whitespace</tt> option. New lines will still be fixed, though.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--whitespace=<action>
</dt>
<dd>
@@ -594,12 +690,12 @@ on the command line, and ignored if there is any include pattern.</p></div> by a tab character inside the initial indent of the line are
considered whitespace errors.
</p>
-<div class="para"><p>By default, the command outputs warning messages but applies the patch.
+<div class="paragraph"><p>By default, the command outputs warning messages but applies the patch.
When <tt>git-apply</tt> is used for statistics and not applying a
patch, it defaults to <tt>nowarn</tt>.</p></div>
-<div class="para"><p>You can use different <tt><action></tt> values to control this
+<div class="paragraph"><p>You can use different <tt><action></tt> values to control this
behavior:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
<tt>nowarn</tt> turns off the trailing whitespace warning.
@@ -632,7 +728,7 @@ behavior:</p></div> </li>
</ul></div>
</dd>
-<dt>
+<dt class="hdlist1">
--inaccurate-eof
</dt>
<dd>
@@ -644,10 +740,10 @@ behavior:</p></div> working around this bug.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-v
</dt>
-<dt>
+<dt class="hdlist1">
--verbose
</dt>
<dd>
@@ -657,7 +753,7 @@ behavior:</p></div> additional information to be reported.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--recount
</dt>
<dd>
@@ -667,7 +763,7 @@ behavior:</p></div> adjusting the hunk headers appropriately).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--directory=<root>
</dt>
<dd>
@@ -675,7 +771,7 @@ behavior:</p></div> Prepend <root> to all filenames. If a "-p" argument was also passed,
it is applied before prepending the new root.
</p>
-<div class="para"><p>For example, a patch that talks about updating <tt>a/git-gui.sh</tt> to <tt>b/git-gui.sh</tt>
+<div class="paragraph"><p>For example, a patch that talks about updating <tt>a/git-gui.sh</tt> to <tt>b/git-gui.sh</tt>
can be applied to the file in the working tree <tt>modules/git-gui/git-gui.sh</tt> by
running <tt>git apply --directory=modules/git-gui</tt>.</p></div>
</dd>
@@ -683,8 +779,8 @@ running <tt>git apply --directory=modules/git-gui</tt>.</p></div> </div>
<h2 id="_configuration">Configuration</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
apply.ignorewhitespace
</dt>
<dd>
@@ -694,7 +790,7 @@ apply.ignorewhitespace whitespace to be significant.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
apply.whitespace
</dt>
<dd>
@@ -707,36 +803,36 @@ apply.whitespace </div>
<h2 id="_submodules">Submodules</h2>
<div class="sectionbody">
-<div class="para"><p>If the patch contains any changes to submodules then <em>git apply</em>
+<div class="paragraph"><p>If the patch contains any changes to submodules then <em>git apply</em>
treats these changes as follows.</p></div>
-<div class="para"><p>If <tt>--index</tt> is specified (explicitly or implicitly), then the submodule
+<div class="paragraph"><p>If <tt>--index</tt> is specified (explicitly or implicitly), then the submodule
commits must match the index exactly for the patch to apply. If any
of the submodules are checked-out, then these check-outs are completely
ignored, i.e., they are not required to be up-to-date or clean and they
are not updated.</p></div>
-<div class="para"><p>If <tt>--index</tt> is not specified, then the submodule commits in the patch
+<div class="paragraph"><p>If <tt>--index</tt> is not specified, then the submodule commits in the patch
are ignored and only the absence or presence of the corresponding
subdirectory is checked and (if possible) updated.</p></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="para"><p><a href="git-am.html">git-am(1)</a>.</p></div>
+<div class="paragraph"><p><a href="git-am.html">git-am(1)</a>.</p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
+<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<div class="para"><p>Documentation by Junio C Hamano</p></div>
+<div class="paragraph"><p>Documentation by Junio C Hamano</p></div>
</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-10-22 04:11:02 UTC
+Last updated 2010-11-06 00:41:57 UTC
</div>
</div>
</body>
|