git-apply.html

   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" />
   6 <meta name="generator" content="AsciiDoc 8.5.2" />
   7 <title>git-apply(1)</title>
   8 <style type="text/css">
   9 /* Debug borders */
  10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  11 /*
  12   border: 1px solid red;
  13 */
  14 }
  15
  16 body {
  17   margin: 1em 5% 1em 5%;
  18 }
  19
  20 a {
  21   color: blue;
  22   text-decoration: underline;
  23 }
  24 a:visited {
  25   color: fuchsia;
  26 }
  27
  28 em {
  29   font-style: italic;
  30   color: navy;
  31 }
  32
  33 strong {
  34   font-weight: bold;
  35   color: #083194;
  36 }
  37
  38 tt {
  39   color: navy;
  40 }
  41
  42 h1, 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
  50 h1, h2, h3 {
  51   border-bottom: 2px solid silver;
  52 }
  53 h2 {
  54   padding-top: 0.5em;
  55 }
  56 h3 {
  57   float: left;
  58 }
  59 h3 + * {
  60   clear: left;
  61 }
  62
  63 div.sectionbody {
  64   font-family: serif;
  65   margin-left: 0;
  66 }
  67
  68 hr {
  69   border: 1px solid silver;
  70 }
  71
  72 p {
  73   margin-top: 0.5em;
  74   margin-bottom: 0.5em;
  75 }
  76
  77 ul, ol, li > p {
  78   margin-top: 0;
  79 }
  80
  81 pre {
  82   padding: 0;
  83   margin: 0;
  84 }
  85
  86 span#author {
  87   color: #527bbd;
  88   font-family: sans-serif;
  89   font-weight: bold;
  90   font-size: 1.1em;
  91 }
  92 span#email {
  93 }
  94 span#revnumber, span#revdate, span#revremark {
  95   font-family: sans-serif;
  96 }
  97
  98 div#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 }
 105 div#footer-text {
 106   float: left;
 107   padding-bottom: 0.5em;
 108 }
 109 div#footer-badges {
 110   float: right;
 111   padding-bottom: 0.5em;
 112 }
 113
 114 div#preamble {
 115   margin-top: 1.5em;
 116   margin-bottom: 1.5em;
 117 }
 118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 120 div.admonitionblock {
 121   margin-top: 1.0em;
 122   margin-bottom: 1.5em;
 123 }
 124 div.admonitionblock {
 125   margin-top: 2.0em;
 126   margin-bottom: 2.0em;
 127   margin-right: 10%;
 128   color: #606060;
 129 }
 130
 131 div.content { /* Block element content. */
 132   padding: 0;
 133 }
 134
 135 /* Block element titles. */
 136 div.title, caption.title {
 137   color: #527bbd;
 138   font-family: sans-serif;
 139   font-weight: bold;
 140   text-align: left;
 141   margin-top: 1.0em;
 142   margin-bottom: 0.5em;
 143 }
 144 div.title + * {
 145   margin-top: 0;
 146 }
 147
 148 td div.title:first-child {
 149   margin-top: 0.0em;
 150 }
 151 div.content div.title:first-child {
 152   margin-top: 0.0em;
 153 }
 154 div.content + div.title {
 155   margin-top: 0.0em;
 156 }
 157
 158 div.sidebarblock > div.content {
 159   background: #ffffee;
 160   border: 1px solid silver;
 161   padding: 0.5em;
 162 }
 163
 164 div.listingblock > div.content {
 165   border: 1px solid silver;
 166   background: #f4f4f4;
 167   padding: 0.5em;
 168 }
 169
 170 div.quoteblock, div.verseblock {
 171   padding-left: 1.0em;
 172   margin-left: 1.0em;
 173   margin-right: 10%;
 174   border-left: 5px solid #dddddd;
 175   color: #777777;
 176 }
 177
 178 div.quoteblock > div.attribution {
 179   padding-top: 0.5em;
 180   text-align: right;
 181 }
 182
 183 div.verseblock > div.content {
 184   white-space: pre;
 185 }
 186 div.verseblock > div.attribution {
 187   padding-top: 0.75em;
 188   text-align: left;
 189 }
 190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 191 div.verseblock + div.attribution {
 192   text-align: left;
 193 }
 194
 195 div.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 }
 203 div.admonitionblock td.content {
 204   padding-left: 0.5em;
 205   border-left: 3px solid #dddddd;
 206 }
 207
 208 div.exampleblock > div.content {
 209   border-left: 3px solid #dddddd;
 210   padding-left: 0.5em;
 211 }
 212
 213 div.imageblock div.content { padding-left: 0; }
 214 span.image img { border-style: none; }
 215 a.image:visited { color: white; }
 216
 217 dl {
 218   margin-top: 0.8em;
 219   margin-bottom: 0.8em;
 220 }
 221 dt {
 222   margin-top: 0.5em;
 223   margin-bottom: 0;
 224   font-style: normal;
 225   color: navy;
 226 }
 227 dd > *:first-child {
 228   margin-top: 0.1em;
 229 }
 230
 231 ul, ol {
 232     list-style-position: outside;
 233 }
 234 ol.arabic {
 235   list-style-type: decimal;
 236 }
 237 ol.loweralpha {
 238   list-style-type: lower-alpha;
 239 }
 240 ol.upperalpha {
 241   list-style-type: upper-alpha;
 242 }
 243 ol.lowerroman {
 244   list-style-type: lower-roman;
 245 }
 246 ol.upperroman {
 247   list-style-type: upper-roman;
 248 }
 249
 250 div.compact ul, div.compact ol,
 251 div.compact p, div.compact p,
 252 div.compact div, div.compact div {
 253   margin-top: 0.1em;
 254   margin-bottom: 0.1em;
 255 }
 256
 257 div.tableblock > table {
 258   border: 3px solid #527bbd;
 259 }
 260 thead, p.table.header {
 261   font-family: sans-serif;
 262   font-weight: bold;
 263 }
 264 tfoot {
 265   font-weight: bold;
 266 }
 267 td > div.verse {
 268   white-space: pre;
 269 }
 270 p.table {
 271   margin-top: 0;
 272 }
 273 /* Because the table frame attribute is overriden by CSS in most browsers. */
 274 div.tableblock > table[frame="void"] {
 275   border-style: none;
 276 }
 277 div.tableblock > table[frame="hsides"] {
 278   border-left-style: none;
 279   border-right-style: none;
 280 }
 281 div.tableblock > table[frame="vsides"] {
 282   border-top-style: none;
 283   border-bottom-style: none;
 284 }
 285
 286
 287 div.hdlist {
 288   margin-top: 0.8em;
 289   margin-bottom: 0.8em;
 290 }
 291 div.hdlist tr {
 292   padding-bottom: 15px;
 293 }
 294 dt.hdlist1.strong, td.hdlist1.strong {
 295   font-weight: bold;
 296 }
 297 td.hdlist1 {
 298   vertical-align: top;
 299   font-style: normal;
 300   padding-right: 0.8em;
 301   color: navy;
 302 }
 303 td.hdlist2 {
 304   vertical-align: top;
 305 }
 306 div.hdlist.compact tr {
 307   margin: 0;
 308   padding-bottom: 0;
 309 }
 310
 311 .comment {
 312   background: yellow;
 313 }
 314
 315 .footnote, .footnoteref {
 316   font-size: 0.8em;
 317 }
 318
 319 span.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
 343 @media print {
 344   div#footer-badges { display: none; }
 345 }
 346
 347 div#toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 div#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
 360 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 361   margin-top: 0;
 362   margin-bottom: 0;
 363 }
 364 div.toclevel2 {
 365   margin-left: 2em;
 366   font-size: 0.9em;
 367 }
 368 div.toclevel3 {
 369   margin-left: 4em;
 370   font-size: 0.9em;
 371 }
 372 div.toclevel4 {
 373   margin-left: 6em;
 374   font-size: 0.9em;
 375 }
 376 /* Overrides for manpage documents */
 377 h1 {
 378   padding-top: 0.5em;
 379   padding-bottom: 0.5em;
 380   border-top: 2px solid silver;
 381   border-bottom: 2px solid silver;
 382 }
 383 h2 {
 384   border-style: none;
 385 }
 386 div.sectionbody {
 387   margin-left: 5%;
 388 }
 389
 390 @media print {
 391   div#toc { display: none; }
 392 }
 393
 394 /* Workarounds for IE6's broken and incomplete CSS2. */
 395
 396 div.sidebar-content {
 397   background: #ffffee;
 398   border: 1px solid silver;
 399   padding: 0.5em;
 400 }
 401 div.sidebar-title, div.image-title {
 402   color: #527bbd;
 403   font-family: sans-serif;
 404   font-weight: bold;
 405   margin-top: 0.0em;
 406   margin-bottom: 0.5em;
 407 }
 408
 409 div.listingblock div.content {
 410   border: 1px solid silver;
 411   background: #f4f4f4;
 412   padding: 0.5em;
 413 }
 414
 415 div.quoteblock-attribution {
 416   padding-top: 0.5em;
 417   text-align: right;
 418 }
 419
 420 div.verseblock-content {
 421   white-space: pre;
 422 }
 423 div.verseblock-attribution {
 424   padding-top: 0.75em;
 425   text-align: left;
 426 }
 427
 428 div.exampleblock-content {
 429   border-left: 3px solid #dddddd;
 430   padding-left: 0.5em;
 431 }
 432
 433 /* IE6 sets dynamically generated links as visited. */
 434 div#toc a:visited { color: blue; }
 435 </style>
 436 <script type="text/javascript">
 437 /*<![CDATA[*/
 438 window.onload = function(){asciidoc.footnotes();}
 439 var 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.
 459 toc: 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
 526 footnotes: 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>
 569 </head>
 570 <body>
 571 <div id="header">
 572 <h1>
 573 git-apply(1) Manual Page
 574 </h1>
 575 <h2>NAME</h2>
 576 <div class="sectionbody">
 577 <p>git-apply -
 578    Apply a patch to files and/or to the index
 579 </p>
 580 </div>
 581 </div>
 582 <div id="content">
 583 <h2 id="_synopsis">SYNOPSIS</h2>
 584 <div class="sectionbody">
 585 <div class="verseblock">
 586 <div class="verseblock-content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
 587           [--apply] [--no-add] [--build-fake-ancestor=&lt;file&gt;] [-R | --reverse]
 588           [--allow-binary-replacement | --binary] [--reject] [-z]
 589           [-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]
 590           [--ignore-space-change | --ignore-whitespace ]
 591           [--whitespace=(nowarn|warn|fix|error|error-all)]
 592           [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--directory=&lt;root&gt;]
 593           [--verbose] [&lt;patch&gt;&#8230;]</div>
 594 <div class="verseblock-attribution">
 595 </div></div>
 596 </div>
 597 <h2 id="_description">DESCRIPTION</h2>
 598 <div class="sectionbody">
 599 <div class="paragraph"><p>Reads the supplied diff output (i.e. "a patch") and applies it to files.
 600 With the <tt>--index</tt> option the patch is also applied to the index, and
 601 with the <tt>--cached</tt> option the patch is only applied to the index.
 602 Without these options, the command applies the patch only to files,
 603 and does not require them to be in a git repository.</p></div>
 604 <div class="paragraph"><p>This command applies the patch but does not create a commit.  Use
 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>
 607 </div>
 608 <h2 id="_options">OPTIONS</h2>
 609 <div class="sectionbody">
 610 <div class="dlist"><dl>
 611 <dt class="hdlist1">
 612 &lt;patch&gt;&#8230;
 613 </dt>
 614 <dd>
 615 <p>
 616         The files to read the patch from.  <em>-</em> can be used to read
 617         from the standard input.
 618 </p>
 619 </dd>
 620 <dt class="hdlist1">
 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>
 629 <dt class="hdlist1">
 630 --numstat
 631 </dt>
 632 <dd>
 633 <p>
 634         Similar to <tt>--stat</tt>, but shows the number of added and
 635         deleted lines in decimal notation and the pathname without
 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".
 639 </p>
 640 </dd>
 641 <dt class="hdlist1">
 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>
 652 <dt class="hdlist1">
 653 --check
 654 </dt>
 655 <dd>
 656 <p>
 657         Instead of applying the patch, see if the patch is
 658         applicable to the current working tree and/or the index
 659         file and detects errors.  Turns off "apply".
 660 </p>
 661 </dd>
 662 <dt class="hdlist1">
 663 --index
 664 </dt>
 665 <dd>
 666 <p>
 667         When <tt>--check</tt> is in effect, or when applying the patch
 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
 671         the file to be patched in the working tree is not
 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>
 676 <dt class="hdlist1">
 677 --cached
 678 </dt>
 679 <dd>
 680 <p>
 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
 683         without using the working tree. This implies <tt>--index</tt>.
 684 </p>
 685 </dd>
 686 <dt class="hdlist1">
 687 --build-fake-ancestor=&lt;file&gt;
 688 </dt>
 689 <dd>
 690 <p>
 691         Newer <em>git diff</em> output has embedded <em>index information</em>
 692         for each blob to help identify the original version that
 693         the patch applies to.  When this flag is given, and if
 694         the original versions of the blobs are available locally,
 695         builds a temporary index containing those blobs.
 696 </p>
 697 <div class="paragraph"><p>When a pure mode change is encountered (which has no index information),
 698 the information is read from the current index instead.</p></div>
 699 </dd>
 700 <dt class="hdlist1">
 701 -R
 702 </dt>
 703 <dt class="hdlist1">
 704 --reverse
 705 </dt>
 706 <dd>
 707 <p>
 708         Apply the patch in reverse.
 709 </p>
 710 </dd>
 711 <dt class="hdlist1">
 712 --reject
 713 </dt>
 714 <dd>
 715 <p>
 716         For atomicity, <em>git apply</em> by default fails the whole patch and
 717         does not touch the working tree when some of the hunks
 718         do not apply.  This option makes it apply
 719         the parts of the patch that are applicable, and leave the
 720         rejected hunks in corresponding *.rej files.
 721 </p>
 722 </dd>
 723 <dt class="hdlist1">
 724 -z
 725 </dt>
 726 <dd>
 727 <p>
 728         When <tt>--numstat</tt> has been given, do not munge pathnames,
 729         but use a NUL-terminated machine-readable format.
 730 </p>
 731 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
 732 and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>,
 733 respectively, and the pathname will be enclosed in double quotes if
 734 any of those replacements occurred.</p></div>
 735 </dd>
 736 <dt class="hdlist1">
 737 -p&lt;n&gt;
 738 </dt>
 739 <dd>
 740 <p>
 741         Remove &lt;n&gt; leading slashes from traditional diff paths. The
 742         default is 1.
 743 </p>
 744 </dd>
 745 <dt class="hdlist1">
 746 -C&lt;n&gt;
 747 </dt>
 748 <dd>
 749 <p>
 750         Ensure at least &lt;n&gt; lines of surrounding context match before
 751         and after each change.  When fewer lines of surrounding
 752         context exist they all must match.  By default no context is
 753         ever ignored.
 754 </p>
 755 </dd>
 756 <dt class="hdlist1">
 757 --unidiff-zero
 758 </dt>
 759 <dd>
 760 <p>
 761         By default, <em>git apply</em> expects that the patch being
 762         applied is a unified diff with at least one line of context.
 763         This provides good safety measures, but breaks down when
 764         applying a diff generated with <tt>--unified=0</tt>. To bypass these
 765         checks use <tt>--unidiff-zero</tt>.
 766 </p>
 767 <div class="paragraph"><p>Note, for the reasons stated above usage of context-free patches is
 768 discouraged.</p></div>
 769 </dd>
 770 <dt class="hdlist1">
 771 --apply
 772 </dt>
 773 <dd>
 774 <p>
 775         If you use any of the options marked "Turns off
 776         <em>apply</em>" above, <em>git apply</em> reads and outputs the
 777         requested information without actually applying the
 778         patch.  Give this flag after those flags to also apply
 779         the patch.
 780 </p>
 781 </dd>
 782 <dt class="hdlist1">
 783 --no-add
 784 </dt>
 785 <dd>
 786 <p>
 787         When applying a patch, ignore additions made by the
 788         patch.  This can be used to extract the common part between
 789         two files by first running <em>diff</em> on them and applying
 790         the result with this option, which would apply the
 791         deletion part but not the addition part.
 792 </p>
 793 </dd>
 794 <dt class="hdlist1">
 795 --allow-binary-replacement
 796 </dt>
 797 <dt class="hdlist1">
 798 --binary
 799 </dt>
 800 <dd>
 801 <p>
 802         Historically we did not allow binary patch applied
 803         without an explicit permission from the user, and this
 804         flag was the way to do so.  Currently we always allow binary
 805         patch application, so this is a no-op.
 806 </p>
 807 </dd>
 808 <dt class="hdlist1">
 809 --exclude=&lt;path-pattern&gt;
 810 </dt>
 811 <dd>
 812 <p>
 813         Don&#8217;t apply changes to files matching the given path pattern. This can
 814         be useful when importing patchsets, where you want to exclude certain
 815         files or directories.
 816 </p>
 817 </dd>
 818 <dt class="hdlist1">
 819 --include=&lt;path-pattern&gt;
 820 </dt>
 821 <dd>
 822 <p>
 823         Apply changes to files matching the given path pattern. This can
 824         be useful when importing patchsets, where you want to include certain
 825         files or directories.
 826 </p>
 827 <div class="paragraph"><p>When <tt>--exclude</tt> and <tt>--include</tt> patterns are used, they are examined in the
 828 order they appear on the command line, and the first match determines if a
 829 patch to each path is used.  A patch to a path that does not match any
 830 include/exclude pattern is used by default if there is no include pattern
 831 on the command line, and ignored if there is any include pattern.</p></div>
 832 </dd>
 833 <dt class="hdlist1">
 834 --ignore-space-change
 835 </dt>
 836 <dt class="hdlist1">
 837 --ignore-whitespace
 838 </dt>
 839 <dd>
 840 <p>
 841         When applying a patch, ignore changes in whitespace in context
 842         lines if necessary.
 843         Context lines will preserve their whitespace, and they will not
 844         undergo whitespace fixing regardless of the value of the
 845         <tt>--whitespace</tt> option. New lines will still be fixed, though.
 846 </p>
 847 </dd>
 848 <dt class="hdlist1">
 849 --whitespace=&lt;action&gt;
 850 </dt>
 851 <dd>
 852 <p>
 853         When applying a patch, detect a new or modified line that has
 854         whitespace errors.  What are considered whitespace errors is
 855         controlled by <tt>core.whitespace</tt> configuration.  By default,
 856         trailing whitespaces (including lines that solely consist of
 857         whitespaces) and a space character that is immediately followed
 858         by a tab character inside the initial indent of the line are
 859         considered whitespace errors.
 860 </p>
 861 <div class="paragraph"><p>By default, the command outputs warning messages but applies the patch.
 862 When <tt>git-apply</tt> is used for statistics and not applying a
 863 patch, it defaults to <tt>nowarn</tt>.</p></div>
 864 <div class="paragraph"><p>You can use different <tt>&lt;action&gt;</tt> values to control this
 865 behavior:</p></div>
 866 <div class="ulist"><ul>
 867 <li>
 868 <p>
 869 <tt>nowarn</tt> turns off the trailing whitespace warning.
 870 </p>
 871 </li>
 872 <li>
 873 <p>
 874 <tt>warn</tt> outputs warnings for a few such errors, but applies the
 875   patch as-is (default).
 876 </p>
 877 </li>
 878 <li>
 879 <p>
 880 <tt>fix</tt> outputs warnings for a few such errors, and applies the
 881   patch after fixing them (<tt>strip</tt> is a synonym --- the tool
 882   used to consider only trailing whitespace characters as errors, and the
 883   fix involved <em>stripping</em> them, but modern gits do more).
 884 </p>
 885 </li>
 886 <li>
 887 <p>
 888 <tt>error</tt> outputs warnings for a few such errors, and refuses
 889   to apply the patch.
 890 </p>
 891 </li>
 892 <li>
 893 <p>
 894 <tt>error-all</tt> is similar to <tt>error</tt> but shows all errors.
 895 </p>
 896 </li>
 897 </ul></div>
 898 </dd>
 899 <dt class="hdlist1">
 900 --inaccurate-eof
 901 </dt>
 902 <dd>
 903 <p>
 904         Under certain circumstances, some versions of <em>diff</em> do not correctly
 905         detect a missing new-line at the end of the file. As a result, patches
 906         created by such <em>diff</em> programs do not record incomplete lines
 907         correctly. This option adds support for applying such patches by
 908         working around this bug.
 909 </p>
 910 </dd>
 911 <dt class="hdlist1">
 912 -v
 913 </dt>
 914 <dt class="hdlist1">
 915 --verbose
 916 </dt>
 917 <dd>
 918 <p>
 919         Report progress to stderr. By default, only a message about the
 920         current patch being applied will be printed. This option will cause
 921         additional information to be reported.
 922 </p>
 923 </dd>
 924 <dt class="hdlist1">
 925 --recount
 926 </dt>
 927 <dd>
 928 <p>
 929         Do not trust the line counts in the hunk headers, but infer them
 930         by inspecting the patch (e.g. after editing the patch without
 931         adjusting the hunk headers appropriately).
 932 </p>
 933 </dd>
 934 <dt class="hdlist1">
 935 --directory=&lt;root&gt;
 936 </dt>
 937 <dd>
 938 <p>
 939         Prepend &lt;root&gt; to all filenames.  If a "-p" argument was also passed,
 940         it is applied before prepending the new root.
 941 </p>
 942 <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>
 943 can be applied to the file in the working tree <tt>modules/git-gui/git-gui.sh</tt> by
 944 running <tt>git apply --directory=modules/git-gui</tt>.</p></div>
 945 </dd>
 946 </dl></div>
 947 </div>
 948 <h2 id="_configuration">Configuration</h2>
 949 <div class="sectionbody">
 950 <div class="dlist"><dl>
 951 <dt class="hdlist1">
 952 apply.ignorewhitespace
 953 </dt>
 954 <dd>
 955 <p>
 956         Set to <em>change</em> if you want changes in whitespace to be ignored by default.
 957         Set to one of: no, none, never, false if you want changes in
 958         whitespace to be significant.
 959 </p>
 960 </dd>
 961 <dt class="hdlist1">
 962 apply.whitespace
 963 </dt>
 964 <dd>
 965 <p>
 966         When no <tt>--whitespace</tt> flag is given from the command
 967         line, this configuration item is used as the default.
 968 </p>
 969 </dd>
 970 </dl></div>
 971 </div>
 972 <h2 id="_submodules">Submodules</h2>
 973 <div class="sectionbody">
 974 <div class="paragraph"><p>If the patch contains any changes to submodules then <em>git apply</em>
 975 treats these changes as follows.</p></div>
 976 <div class="paragraph"><p>If <tt>--index</tt> is specified (explicitly or implicitly), then the submodule
 977 commits must match the index exactly for the patch to apply.  If any
 978 of the submodules are checked-out, then these check-outs are completely
 979 ignored, i.e., they are not required to be up-to-date or clean and they
 980 are not updated.</p></div>
 981 <div class="paragraph"><p>If <tt>--index</tt> is not specified, then the submodule commits in the patch
 982 are ignored and only the absence or presence of the corresponding
 983 subdirectory is checked and (if possible) updated.</p></div>
 984 </div>
 985 <h2 id="_see_also">SEE ALSO</h2>
 986 <div class="sectionbody">
 987 <div class="paragraph"><p><a href="git-am.html">git-am(1)</a>.</p></div>
 988 </div>
 989 <h2 id="_git">GIT</h2>
 990 <div class="sectionbody">
 991 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 992 </div>
 993 </div>
 994 <div id="footnotes"><hr /></div>
 995 <div id="footer">
 996 <div id="footer-text">
 997 Last updated 2011-09-21 23:01:14 PDT
 998 </div>
 999 </div>
1000 </body>
1001 </html>