Google Git
Sign in
chromium / external / gitster / git-htmldocs / 0248269de7cca134098c35330c96a84a39eca214 / . / git-apply.html
blob: 721cdf0d18c4f68a5d1f5718c87b105a614af289 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-apply(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]30 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]35 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]50h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]90 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]91}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]182
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]285
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]302}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]429 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573git-apply(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-apply -
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]578 Apply a patch to files and/or to the index
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]584<div class="sectionbody">
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]585<div class="verseblock">
Junio C Hamano02482692012-07-16 05:28:39[diff] [blame^]586<div class="verseblock-content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]587 [--apply] [--no-add] [--build-fake-ancestor=&lt;file&gt;] [-R | --reverse]
Junio C Hamano0e3cb532007-04-17 08:28:11[diff] [blame]588 [--allow-binary-replacement | --binary] [--reject] [-z]
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]589 [-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]590 [--ignore-space-change | --ignore-whitespace ]
Junio C Hamanod2179ef2010-10-22 04:12:17[diff] [blame]591 [--whitespace=(nowarn|warn|fix|error|error-all)]
592 [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--directory=&lt;root&gt;]
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]593 [--verbose] [&lt;patch&gt;&#8230;]</div>
594<div class="verseblock-attribution">
595</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]596</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]597<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]598<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]599<div class="paragraph"><p>Reads the supplied diff output (i.e. "a patch") and applies it to files.
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]600With the <tt>--index</tt> option the patch is also applied to the index, and
Junio C Hamano6b8a0792011-03-04 23:54:30[diff] [blame]601with the <tt>--cached</tt> option the patch is only applied to the index.
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]602Without these options, the command applies the patch only to files,
603and does not require them to be in a git repository.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]604<div class="paragraph"><p>This command applies the patch but does not create a commit. Use
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]605<a href="git-am.html">git-am(1)</a> to create commits from patches generated by
606<a href="git-format-patch.html">git-format-patch(1)</a> and/or received by email.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]607</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]608<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]609<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]610<div class="dlist"><dl>
611<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]612&lt;patch&gt;&#8230;
613</dt>
614<dd>
615<p>
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]616 The files to read the patch from. <em>-</em> can be used to read
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]617 from the standard input.
618</p>
619</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]620<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]621--stat
622</dt>
623<dd>
624<p>
625 Instead of applying the patch, output diffstat for the
626 input. Turns off "apply".
627</p>
628</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]629<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]630--numstat
631</dt>
632<dd>
633<p>
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]634 Similar to <tt>--stat</tt>, but shows the number of added and
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]635 deleted lines in decimal notation and the pathname without
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]636 abbreviation, to make it more machine friendly. For
637 binary files, outputs two <tt>-</tt> instead of saying
638 <tt>0 0</tt>. Turns off "apply".
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]639</p>
640</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]641<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]642--summary
643</dt>
644<dd>
645<p>
646 Instead of applying the patch, output a condensed
647 summary of information obtained from git diff extended
648 headers, such as creations, renames and mode changes.
649 Turns off "apply".
650</p>
651</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]652<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]653--check
654</dt>
655<dd>
656<p>
657 Instead of applying the patch, see if the patch is
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]658 applicable to the current working tree and/or the index
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]659 file and detects errors. Turns off "apply".
660</p>
661</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]662<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]663--index
664</dt>
665<dd>
666<p>
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]667 When <tt>--check</tt> is in effect, or when applying the patch
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]668 (which is the default when none of the options that
669 disables it is in effect), make sure the patch is
670 applicable to what the current index file records. If
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]671 the file to be patched in the working tree is not
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]672 up-to-date, it is flagged as an error. This flag also
673 causes the index file to be updated.
674</p>
675</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]676<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]677--cached
678</dt>
679<dd>
680<p>
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]681 Apply a patch without touching the working tree. Instead take the
682 cached data, apply the patch, and store the result in the index
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]683 without using the working tree. This implies <tt>--index</tt>.
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]684</p>
685</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]686<dt class="hdlist1">
Junio C Hamano02482692012-07-16 05:28:39[diff] [blame^]687-3
688</dt>
689<dt class="hdlist1">
690--3way
691</dt>
692<dd>
693<p>
694 When the patch does not apply cleanly, fall back on 3-way merge if
695 the patch records the identity of blobs it is supposed to apply to,
696 and we have those blobs available locally, possibly leaving the
697 conflict markers in the files in the working tree for the user to
698 resolve. This option implies the <tt>--index</tt> option, and is incompatible
699 with the <tt>--reject</tt> and the <tt>--cached</tt> options.
700</p>
701</dd>
702<dt class="hdlist1">
Junio C Hamanobd53dbf2009-01-18 18:26:37[diff] [blame]703--build-fake-ancestor=&lt;file&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]704</dt>
705<dd>
706<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]707 Newer <em>git diff</em> output has embedded <em>index information</em>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]708 for each blob to help identify the original version that
709 the patch applies to. When this flag is given, and if
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]710 the original versions of the blobs are available locally,
Junio C Hamano01d8f832007-09-24 07:37:30[diff] [blame]711 builds a temporary index containing those blobs.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]712</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]713<div class="paragraph"><p>When a pure mode change is encountered (which has no index information),
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]714the information is read from the current index instead.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]715</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]716<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]717-R
718</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]719<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]720--reverse
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]721</dt>
722<dd>
723<p>
724 Apply the patch in reverse.
725</p>
726</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]727<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]728--reject
729</dt>
730<dd>
731<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]732 For atomicity, <em>git apply</em> by default fails the whole patch and
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]733 does not touch the working tree when some of the hunks
734 do not apply. This option makes it apply
Junio C Hamano9adfc6a2006-08-28 07:18:38[diff] [blame]735 the parts of the patch that are applicable, and leave the
736 rejected hunks in corresponding *.rej files.
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]737</p>
738</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]739<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]740-z
741</dt>
742<dd>
743<p>
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]744 When <tt>--numstat</tt> has been given, do not munge pathnames,
745 but use a NUL-terminated machine-readable format.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]746</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]747<div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]748and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>,
749respectively, and the pathname will be enclosed in double quotes if
750any of those replacements occurred.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]751</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]752<dt class="hdlist1">
Junio C Hamano8af15b02006-02-01 00:59:26[diff] [blame]753-p&lt;n&gt;
754</dt>
755<dd>
756<p>
757 Remove &lt;n&gt; leading slashes from traditional diff paths. The
758 default is 1.
759</p>
760</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]761<dt class="hdlist1">
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]762-C&lt;n&gt;
763</dt>
764<dd>
765<p>
766 Ensure at least &lt;n&gt; lines of surrounding context match before
767 and after each change. When fewer lines of surrounding
Junio C Hamano33db4372006-06-07 19:51:45[diff] [blame]768 context exist they all must match. By default no context is
Junio C Hamano54559c82006-04-13 07:45:12[diff] [blame]769 ever ignored.
770</p>
771</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]772<dt class="hdlist1">
Junio C Hamano3eb513f2006-09-18 02:47:16[diff] [blame]773--unidiff-zero
774</dt>
775<dd>
776<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]777 By default, <em>git apply</em> expects that the patch being
Junio C Hamano3eb513f2006-09-18 02:47:16[diff] [blame]778 applied is a unified diff with at least one line of context.
779 This provides good safety measures, but breaks down when
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]780 applying a diff generated with <tt>--unified=0</tt>. To bypass these
781 checks use <tt>--unidiff-zero</tt>.
Junio C Hamano3eb513f2006-09-18 02:47:16[diff] [blame]782</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]783<div class="paragraph"><p>Note, for the reasons stated above usage of context-free patches is
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]784discouraged.</p></div>
Junio C Hamano3eb513f2006-09-18 02:47:16[diff] [blame]785</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]786<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]787--apply
788</dt>
789<dd>
790<p>
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]791 If you use any of the options marked "Turns off
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]792 <em>apply</em>" above, <em>git apply</em> reads and outputs the
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]793 requested information without actually applying the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]794 patch. Give this flag after those flags to also apply
795 the patch.
796</p>
797</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]798<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]799--no-add
800</dt>
801<dd>
802<p>
803 When applying a patch, ignore additions made by the
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]804 patch. This can be used to extract the common part between
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]805 two files by first running <em>diff</em> on them and applying
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]806 the result with this option, which would apply the
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]807 deletion part but not the addition part.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]808</p>
809</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]810<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]811--allow-binary-replacement
812</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]813<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]814--binary
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]815</dt>
816<dd>
817<p>
Junio C Hamanofd73d892006-09-14 07:38:22[diff] [blame]818 Historically we did not allow binary patch applied
819 without an explicit permission from the user, and this
820 flag was the way to do so. Currently we always allow binary
821 patch application, so this is a no-op.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]822</p>
823</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]824<dt class="hdlist1">
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]825--exclude=&lt;path-pattern&gt;
826</dt>
827<dd>
828<p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]829 Don&#8217;t apply changes to files matching the given path pattern. This can
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]830 be useful when importing patchsets, where you want to exclude certain
831 files or directories.
832</p>
833</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]834<dt class="hdlist1">
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]835--include=&lt;path-pattern&gt;
836</dt>
837<dd>
838<p>
839 Apply changes to files matching the given path pattern. This can
840 be useful when importing patchsets, where you want to include certain
841 files or directories.
842</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]843<div class="paragraph"><p>When <tt>--exclude</tt> and <tt>--include</tt> patterns are used, they are examined in the
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]844order they appear on the command line, and the first match determines if a
845patch to each path is used. A patch to a path that does not match any
846include/exclude pattern is used by default if there is no include pattern
847on the command line, and ignored if there is any include pattern.</p></div>
848</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]849<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]850--ignore-space-change
851</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]852<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]853--ignore-whitespace
854</dt>
855<dd>
856<p>
857 When applying a patch, ignore changes in whitespace in context
858 lines if necessary.
859 Context lines will preserve their whitespace, and they will not
860 undergo whitespace fixing regardless of the value of the
861 <tt>--whitespace</tt> option. New lines will still be fixed, though.
862</p>
863</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]864<dt class="hdlist1">
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]865--whitespace=&lt;action&gt;
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]866</dt>
867<dd>
868<p>
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]869 When applying a patch, detect a new or modified line that has
870 whitespace errors. What are considered whitespace errors is
871 controlled by <tt>core.whitespace</tt> configuration. By default,
872 trailing whitespaces (including lines that solely consist of
873 whitespaces) and a space character that is immediately followed
874 by a tab character inside the initial indent of the line are
875 considered whitespace errors.
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]876</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]877<div class="paragraph"><p>By default, the command outputs warning messages but applies the patch.
Junio C Hamanof8a79222009-03-01 08:02:50[diff] [blame]878When <tt>git-apply</tt> is used for statistics and not applying a
879patch, it defaults to <tt>nowarn</tt>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]880<div class="paragraph"><p>You can use different <tt>&lt;action&gt;</tt> values to control this
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]881behavior:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]882<div class="ulist"><ul>
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]883<li>
884<p>
885<tt>nowarn</tt> turns off the trailing whitespace warning.
886</p>
887</li>
888<li>
889<p>
890<tt>warn</tt> outputs warnings for a few such errors, but applies the
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]891 patch as-is (default).
892</p>
893</li>
894<li>
895<p>
896<tt>fix</tt> outputs warnings for a few such errors, and applies the
897 patch after fixing them (<tt>strip</tt> is a synonym --- the tool
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]898 used to consider only trailing whitespace characters as errors, and the
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]899 fix involved <em>stripping</em> them, but modern gits do more).
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]900</p>
901</li>
902<li>
903<p>
904<tt>error</tt> outputs warnings for a few such errors, and refuses
905 to apply the patch.
906</p>
907</li>
908<li>
909<p>
910<tt>error-all</tt> is similar to <tt>error</tt> but shows all errors.
911</p>
912</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]913</ul></div>
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]914</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]915<dt class="hdlist1">
Junio C Hamano3a971022006-11-18 22:17:58[diff] [blame]916--inaccurate-eof
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]917</dt>
918<dd>
919<p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]920 Under certain circumstances, some versions of <em>diff</em> do not correctly
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]921 detect a missing new-line at the end of the file. As a result, patches
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]922 created by such <em>diff</em> programs do not record incomplete lines
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]923 correctly. This option adds support for applying such patches by
924 working around this bug.
925</p>
926</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]927<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]928-v
929</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]930<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]931--verbose
Junio C Hamano6b2cee12006-08-26 08:43:31[diff] [blame]932</dt>
933<dd>
934<p>
935 Report progress to stderr. By default, only a message about the
936 current patch being applied will be printed. This option will cause
937 additional information to be reported.
938</p>
939</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]940<dt class="hdlist1">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]941--recount
942</dt>
943<dd>
944<p>
945 Do not trust the line counts in the hunk headers, but infer them
946 by inspecting the patch (e.g. after editing the patch without
947 adjusting the hunk headers appropriately).
948</p>
949</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]950<dt class="hdlist1">
Junio C Hamano208beb72008-07-10 02:30:50[diff] [blame]951--directory=&lt;root&gt;
952</dt>
953<dd>
954<p>
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]955 Prepend &lt;root&gt; to all filenames. If a "-p" argument was also passed,
Junio C Hamano208beb72008-07-10 02:30:50[diff] [blame]956 it is applied before prepending the new root.
957</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]958<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>
Junio C Hamano208beb72008-07-10 02:30:50[diff] [blame]959can be applied to the file in the working tree <tt>modules/git-gui/git-gui.sh</tt> by
960running <tt>git apply --directory=modules/git-gui</tt>.</p></div>
961</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]962</dl></div>
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]963</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]964<h2 id="_configuration">Configuration</h2>
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]965<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]966<div class="dlist"><dl>
967<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]968apply.ignorewhitespace
969</dt>
970<dd>
971<p>
972 Set to <em>change</em> if you want changes in whitespace to be ignored by default.
973 Set to one of: no, none, never, false if you want changes in
974 whitespace to be significant.
975</p>
976</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]977<dt class="hdlist1">
Junio C Hamano5f327762006-03-02 09:14:51[diff] [blame]978apply.whitespace
979</dt>
980<dd>
981<p>
982 When no <tt>--whitespace</tt> flag is given from the command
983 line, this configuration item is used as the default.
984</p>
985</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]986</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]987</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]988<h2 id="_submodules">Submodules</h2>
Junio C Hamano3b178be2007-08-16 04:59:27[diff] [blame]989<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]990<div class="paragraph"><p>If the patch contains any changes to submodules then <em>git apply</em>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]991treats these changes as follows.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]992<div class="paragraph"><p>If <tt>--index</tt> is specified (explicitly or implicitly), then the submodule
Junio C Hamano3b178be2007-08-16 04:59:27[diff] [blame]993commits must match the index exactly for the patch to apply. If any
994of the submodules are checked-out, then these check-outs are completely
995ignored, i.e., they are not required to be up-to-date or clean and they
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]996are not updated.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]997<div class="paragraph"><p>If <tt>--index</tt> is not specified, then the submodule commits in the patch
Junio C Hamano7924d5e2009-03-03 08:28:48[diff] [blame]998are ignored and only the absence or presence of the corresponding
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]999subdirectory is checked and (if possible) updated.</p></div>
Junio C Hamano3b178be2007-08-16 04:59:27[diff] [blame]1000</div>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1001<h2 id="_see_also">SEE ALSO</h2>
1002<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1003<div class="paragraph"><p><a href="git-am.html">git-am(1)</a>.</p></div>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]1004</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1005<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1006<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1007<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1008</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1009</div>
1010<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1011<div id="footer">
1012<div id="footer-text">
Junio C Hamano02482692012-07-16 05:28:39[diff] [blame^]1013Last updated 2012-07-15 22:27:35 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1014</div>
1015</div>
1016</body>
1017</html>