git-cherry-pick.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-cherry-pick(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-cherry-pick(1) Manual Page
 574 </h1>
 575 <h2>NAME</h2>
 576 <div class="sectionbody">
 577 <p>git-cherry-pick -
 578    Apply the changes introduced by some existing commits
 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 cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;
 587 <em>git cherry-pick</em> --reset
 588 <em>git cherry-pick</em> --continue</div>
 589 <div class="verseblock-attribution">
 590 </div></div>
 591 </div>
 592 <h2 id="_description">DESCRIPTION</h2>
 593 <div class="sectionbody">
 594 <div class="paragraph"><p>Given one or more existing commits, apply the change each one
 595 introduces, recording a new commit for each.  This requires your
 596 working tree to be clean (no modifications from the HEAD commit).</p></div>
 597 <div class="paragraph"><p>When it is not obvious how to apply a change, the following
 598 happens:</p></div>
 599 <div class="olist arabic"><ol class="arabic">
 600 <li>
 601 <p>
 602 The current branch and <tt>HEAD</tt> pointer stay at the last commit
 603    successfully made.
 604 </p>
 605 </li>
 606 <li>
 607 <p>
 608 The <tt>CHERRY_PICK_HEAD</tt> ref is set to point at the commit that
 609    introduced the change that is difficult to apply.
 610 </p>
 611 </li>
 612 <li>
 613 <p>
 614 Paths in which the change applied cleanly are updated both
 615    in the index file and in your working tree.
 616 </p>
 617 </li>
 618 <li>
 619 <p>
 620 For conflicting paths, the index file records up to three
 621    versions, as described in the "TRUE MERGE" section of
 622    <a href="git-merge.html">git-merge(1)</a>.  The working tree files will include
 623    a description of the conflict bracketed by the usual
 624    conflict markers <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> and <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt>.
 625 </p>
 626 </li>
 627 <li>
 628 <p>
 629 No other modifications are made.
 630 </p>
 631 </li>
 632 </ol></div>
 633 <div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
 634 conflicts.</p></div>
 635 </div>
 636 <h2 id="_options">OPTIONS</h2>
 637 <div class="sectionbody">
 638 <div class="dlist"><dl>
 639 <dt class="hdlist1">
 640 &lt;commit&gt;&#8230;
 641 </dt>
 642 <dd>
 643 <p>
 644         Commits to cherry-pick.
 645         For a more complete list of ways to spell commits, see
 646         <a href="gitrevisions.html">gitrevisions(7)</a>.
 647         Sets of commits can be passed but no traversal is done by
 648         default, as if the <em>--no-walk</em> option was specified, see
 649         <a href="git-rev-list.html">git-rev-list(1)</a>.
 650 </p>
 651 </dd>
 652 <dt class="hdlist1">
 653 -e
 654 </dt>
 655 <dt class="hdlist1">
 656 --edit
 657 </dt>
 658 <dd>
 659 <p>
 660         With this option, <em>git cherry-pick</em> will let you edit the commit
 661         message prior to committing.
 662 </p>
 663 </dd>
 664 <dt class="hdlist1">
 665 -x
 666 </dt>
 667 <dd>
 668 <p>
 669         When recording the commit, append a line that says
 670         "(cherry picked from commit &#8230;)" to the original commit
 671         message in order to indicate which commit this change was
 672         cherry-picked from.  This is done only for cherry
 673         picks without conflicts.  Do not use this option if
 674         you are cherry-picking from your private branch because
 675         the information is useless to the recipient.  If on the
 676         other hand you are cherry-picking between two publicly
 677         visible branches (e.g. backporting a fix to a
 678         maintenance branch for an older release from a
 679         development branch), adding this information can be
 680         useful.
 681 </p>
 682 </dd>
 683 <dt class="hdlist1">
 684 -r
 685 </dt>
 686 <dd>
 687 <p>
 688         It used to be that the command defaulted to do <tt>-x</tt>
 689         described above, and <tt>-r</tt> was to disable it.  Now the
 690         default is not to do <tt>-x</tt> so this option is a no-op.
 691 </p>
 692 </dd>
 693 <dt class="hdlist1">
 694 -m parent-number
 695 </dt>
 696 <dt class="hdlist1">
 697 --mainline parent-number
 698 </dt>
 699 <dd>
 700 <p>
 701         Usually you cannot cherry-pick a merge because you do not know which
 702         side of the merge should be considered the mainline.  This
 703         option specifies the parent number (starting from 1) of
 704         the mainline and allows cherry-pick to replay the change
 705         relative to the specified parent.
 706 </p>
 707 </dd>
 708 <dt class="hdlist1">
 709 -n
 710 </dt>
 711 <dt class="hdlist1">
 712 --no-commit
 713 </dt>
 714 <dd>
 715 <p>
 716         Usually the command automatically creates a sequence of commits.
 717         This flag applies the changes necessary to cherry-pick
 718         each named commit to your working tree and the index,
 719         without making any commit.  In addition, when this
 720         option is used, your index does not have to match the
 721         HEAD commit.  The cherry-pick is done against the
 722         beginning state of your index.
 723 </p>
 724 <div class="paragraph"><p>This is useful when cherry-picking more than one commits'
 725 effect to your index in a row.</p></div>
 726 </dd>
 727 <dt class="hdlist1">
 728 -s
 729 </dt>
 730 <dt class="hdlist1">
 731 --signoff
 732 </dt>
 733 <dd>
 734 <p>
 735         Add Signed-off-by line at the end of the commit message.
 736 </p>
 737 </dd>
 738 <dt class="hdlist1">
 739 --ff
 740 </dt>
 741 <dd>
 742 <p>
 743         If the current HEAD is the same as the parent of the
 744         cherry-pick&#8217;ed commit, then a fast forward to this commit will
 745         be performed.
 746 </p>
 747 </dd>
 748 <dt class="hdlist1">
 749 --strategy=&lt;strategy&gt;
 750 </dt>
 751 <dd>
 752 <p>
 753         Use the given merge strategy.  Should only be used once.
 754         See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
 755         for details.
 756 </p>
 757 </dd>
 758 <dt class="hdlist1">
 759 -X&lt;option&gt;
 760 </dt>
 761 <dt class="hdlist1">
 762 --strategy-option=&lt;option&gt;
 763 </dt>
 764 <dd>
 765 <p>
 766         Pass the merge strategy-specific option through to the
 767         merge strategy.  See <a href="git-merge.html">git-merge(1)</a> for details.
 768 </p>
 769 </dd>
 770 </dl></div>
 771 </div>
 772 <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
 773 <div class="sectionbody">
 774 <div class="dlist"><dl>
 775 <dt class="hdlist1">
 776 --reset
 777 </dt>
 778 <dd>
 779 <p>
 780         Forget about the current operation in progress.  Can be used
 781         to clear the sequencer state after a failed cherry-pick or
 782         revert.
 783 </p>
 784 </dd>
 785 <dt class="hdlist1">
 786 --continue
 787 </dt>
 788 <dd>
 789 <p>
 790         Continue the operation in progress using the information in
 791         <em>.git/sequencer</em>.  Can be used to continue after resolving
 792         conflicts in a failed cherry-pick or revert.
 793 </p>
 794 </dd>
 795 </dl></div>
 796 </div>
 797 <h2 id="_examples">EXAMPLES</h2>
 798 <div class="sectionbody">
 799 <div class="dlist"><dl>
 800 <dt class="hdlist1">
 801 <tt>git cherry-pick master</tt>
 802 </dt>
 803 <dd>
 804 <p>
 805         Apply the change introduced by the commit at the tip of the
 806         master branch and create a new commit with this change.
 807 </p>
 808 </dd>
 809 <dt class="hdlist1">
 810 <tt>git cherry-pick ..master</tt>
 811 </dt>
 812 <dt class="hdlist1">
 813 <tt>git cherry-pick ^HEAD master</tt>
 814 </dt>
 815 <dd>
 816 <p>
 817         Apply the changes introduced by all commits that are ancestors
 818         of master but not of HEAD to produce new commits.
 819 </p>
 820 </dd>
 821 <dt class="hdlist1">
 822 <tt>git cherry-pick master&#126;4 master&#126;2</tt>
 823 </dt>
 824 <dd>
 825 <p>
 826         Apply the changes introduced by the fifth and third last
 827         commits pointed to by master and create 2 new commits with
 828         these changes.
 829 </p>
 830 </dd>
 831 <dt class="hdlist1">
 832 <tt>git cherry-pick -n master~1 next</tt>
 833 </dt>
 834 <dd>
 835 <p>
 836         Apply to the working tree and the index the changes introduced
 837         by the second last commit pointed to by master and by the last
 838         commit pointed to by next, but do not create any commit with
 839         these changes.
 840 </p>
 841 </dd>
 842 <dt class="hdlist1">
 843 <tt>git cherry-pick --ff ..next</tt>
 844 </dt>
 845 <dd>
 846 <p>
 847         If history is linear and HEAD is an ancestor of next, update
 848         the working tree and advance the HEAD pointer to match next.
 849         Otherwise, apply the changes introduced by those commits that
 850         are in next but not HEAD to the current branch, creating a new
 851         commit for each new change.
 852 </p>
 853 </dd>
 854 <dt class="hdlist1">
 855 <tt>git rev-list --reverse master -- README | git cherry-pick -n --stdin</tt>
 856 </dt>
 857 <dd>
 858 <p>
 859         Apply the changes introduced by all commits on the master
 860         branch that touched README to the working tree and index,
 861         so the result can be inspected and made into a single new
 862         commit if suitable.
 863 </p>
 864 </dd>
 865 </dl></div>
 866 <div class="paragraph"><p>The following sequence attempts to backport a patch, bails out because
 867 the code the patch applies to has changed too much, and then tries
 868 again, this time exercising more care about matching up context lines.</p></div>
 869 <div class="listingblock">
 870 <div class="content">
 871 <pre><tt>$ git cherry-pick topic^             <b>&lt;1&gt;</b>
 872 $ git diff                           <b>&lt;2&gt;</b>
 873 $ git reset --merge ORIG_HEAD        <b>&lt;3&gt;</b>
 874 $ git cherry-pick -Xpatience topic^  <b>&lt;4&gt;</b></tt></pre>
 875 </div></div>
 876 <div class="colist arabic"><ol>
 877 <li>
 878 <p>
 879 apply the change that would be shown by <tt>git show topic^</tt>.
 880 In this example, the patch does not apply cleanly, so
 881 information about the conflict is written to the index and
 882 working tree and no new commit results.
 883 </p>
 884 </li>
 885 <li>
 886 <p>
 887 summarize changes to be reconciled
 888 </p>
 889 </li>
 890 <li>
 891 <p>
 892 cancel the cherry-pick.  In other words, return to the
 893 pre-cherry-pick state, preserving any local modifications you had in
 894 the working tree.
 895 </p>
 896 </li>
 897 <li>
 898 <p>
 899 try to apply the change introduced by <tt>topic^</tt> again,
 900 spending extra time to avoid mistakes based on incorrectly matching
 901 context lines.
 902 </p>
 903 </li>
 904 </ol></div>
 905 </div>
 906 <h2 id="_see_also">SEE ALSO</h2>
 907 <div class="sectionbody">
 908 <div class="paragraph"><p><a href="git-revert.html">git-revert(1)</a></p></div>
 909 </div>
 910 <h2 id="_git">GIT</h2>
 911 <div class="sectionbody">
 912 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 913 </div>
 914 </div>
 915 <div id="footnotes"><hr /></div>
 916 <div id="footer">
 917 <div id="footer-text">
 918 Last updated 2011-10-05 13:59:16 PDT
 919 </div>
 920 </div>
 921 </body>
 922 </html>