1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-apply(1)</title>
\r
264 git-apply(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Apply patch on a git index file and a work tree
\r
274 <div class="sectionbody">
\r
275 <p><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>…]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Reads supplied diff output and applies it on a git index file
\r
280 and a work tree.</p>
\r
283 <div class="sectionbody">
\r
286 <patch>…
\r
290 The files to read patch from. <em>-</em> can be used to read
\r
291 from the standard input.
\r
299 Instead of applying the patch, output diffstat for the
\r
300 input. Turns off "apply".
\r
308 Similar to --stat, but shows number of added and
\r
309 deleted lines in decimal notation and pathname without
\r
310 abbreviation, to make it more machine friendly. Turns
\r
319 Instead of applying the patch, output a condensed
\r
320 summary of information obtained from git diff extended
\r
321 headers, such as creations, renames and mode changes.
\r
330 Instead of applying the patch, see if the patch is
\r
331 applicable to the current work tree and/or the index
\r
332 file and detects errors. Turns off "apply".
\r
340 When --check is in effect, or when applying the patch
\r
341 (which is the default when none of the options that
\r
342 disables it is in effect), make sure the patch is
\r
343 applicable to what the current index file records. If
\r
344 the file to be patched in the work tree is not
\r
345 up-to-date, it is flagged as an error. This flag also
\r
346 causes the index file to be updated.
\r
354 Newer git-diff output has embedded <em>index information</em>
\r
355 for each blob to help identify the original version that
\r
356 the patch applies to. When this flag is given, and if
\r
357 the original version of the blob is available locally,
\r
358 outputs information about them to the standard output.
\r
366 When showing the index information, do not munge paths,
\r
367 but use NUL terminated machine readable format. Without
\r
368 this flag, the pathnames output will have TAB, LF, and
\r
369 backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
\r
378 If you use any of the options marked “Turns off
\r
379 "apply"” above, git-apply reads and outputs the
\r
380 information you asked without actually applying the
\r
381 patch. Give this flag after those flags to also apply
\r
390 When applying a patch, ignore additions made by the
\r
391 patch. This can be used to extract common part between
\r
392 two files by first running <tt>diff</tt> on them and applying
\r
393 the result with this option, which would apply the
\r
394 deletion part but not addition part.
\r
398 --allow-binary-replacement
\r
402 When applying a patch, which is a git-enhanced patch
\r
403 that was prepared to record the pre- and post-image object
\r
404 name in full, and the path being patched exactly matches
\r
405 the object the patch applies to (i.e. "index" line's
\r
406 pre-image object name is what is in the working tree),
\r
407 and the post-image object is available in the object
\r
408 database, use the post-image object as the patch
\r
409 result. This allows binary files to be patched in a
\r
416 <div class="sectionbody">
\r
417 <p>Written by Linus Torvalds <torvalds@osdl.org></p>
\r
419 <h2>Documentation</h2>
\r
420 <div class="sectionbody">
\r
421 <p>Documentation by Junio C Hamano</p>
\r
424 <div class="sectionbody">
\r
425 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
428 <div id="footer-text">
\r
429 Last updated 27-Dec-2005 00:15:45 PDT
\r