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.4.5" />
   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.5em;
 122   margin-bottom: 1.5em;
 123 }
 124 div.admonitionblock {
 125   margin-top: 2.5em;
 126   margin-bottom: 2.5em;
 127 }
 128
 129 div.content { /* Block element content. */
 130   padding: 0;
 131 }
 132
 133 /* Block element titles. */
 134 div.title, caption.title {
 135   color: #527bbd;
 136   font-family: sans-serif;
 137   font-weight: bold;
 138   text-align: left;
 139   margin-top: 1.0em;
 140   margin-bottom: 0.5em;
 141 }
 142 div.title + * {
 143   margin-top: 0;
 144 }
 145
 146 td div.title:first-child {
 147   margin-top: 0.0em;
 148 }
 149 div.content div.title:first-child {
 150   margin-top: 0.0em;
 151 }
 152 div.content + div.title {
 153   margin-top: 0.0em;
 154 }
 155
 156 div.sidebarblock > div.content {
 157   background: #ffffee;
 158   border: 1px solid silver;
 159   padding: 0.5em;
 160 }
 161
 162 div.listingblock > div.content {
 163   border: 1px solid silver;
 164   background: #f4f4f4;
 165   padding: 0.5em;
 166 }
 167
 168 div.quoteblock {
 169   padding-left: 2.0em;
 170   margin-right: 10%;
 171 }
 172 div.quoteblock > div.attribution {
 173   padding-top: 0.5em;
 174   text-align: right;
 175 }
 176
 177 div.verseblock {
 178   padding-left: 2.0em;
 179   margin-right: 10%;
 180 }
 181 div.verseblock > div.content {
 182   white-space: pre;
 183 }
 184 div.verseblock > div.attribution {
 185   padding-top: 0.75em;
 186   text-align: left;
 187 }
 188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 189 div.verseblock + div.attribution {
 190   text-align: left;
 191 }
 192
 193 div.admonitionblock .icon {
 194   vertical-align: top;
 195   font-size: 1.1em;
 196   font-weight: bold;
 197   text-decoration: underline;
 198   color: #527bbd;
 199   padding-right: 0.5em;
 200 }
 201 div.admonitionblock td.content {
 202   padding-left: 0.5em;
 203   border-left: 2px solid silver;
 204 }
 205
 206 div.exampleblock > div.content {
 207   border-left: 2px solid silver;
 208   padding: 0.5em;
 209 }
 210
 211 div.imageblock div.content { padding-left: 0; }
 212 span.image img { border-style: none; }
 213 a.image:visited { color: white; }
 214
 215 dl {
 216   margin-top: 0.8em;
 217   margin-bottom: 0.8em;
 218 }
 219 dt {
 220   margin-top: 0.5em;
 221   margin-bottom: 0;
 222   font-style: normal;
 223   color: navy;
 224 }
 225 dd > *:first-child {
 226   margin-top: 0.1em;
 227 }
 228
 229 ul, ol {
 230     list-style-position: outside;
 231 }
 232 ol.arabic {
 233   list-style-type: decimal;
 234 }
 235 ol.loweralpha {
 236   list-style-type: lower-alpha;
 237 }
 238 ol.upperalpha {
 239   list-style-type: upper-alpha;
 240 }
 241 ol.lowerroman {
 242   list-style-type: lower-roman;
 243 }
 244 ol.upperroman {
 245   list-style-type: upper-roman;
 246 }
 247
 248 div.compact ul, div.compact ol,
 249 div.compact p, div.compact p,
 250 div.compact div, div.compact div {
 251   margin-top: 0.1em;
 252   margin-bottom: 0.1em;
 253 }
 254
 255 div.tableblock > table {
 256   border: 3px solid #527bbd;
 257 }
 258 thead {
 259   font-family: sans-serif;
 260   font-weight: bold;
 261 }
 262 tfoot {
 263   font-weight: bold;
 264 }
 265 td > div.verse {
 266   white-space: pre;
 267 }
 268 p.table {
 269   margin-top: 0;
 270 }
 271 /* Because the table frame attribute is overriden by CSS in most browsers. */
 272 div.tableblock > table[frame="void"] {
 273   border-style: none;
 274 }
 275 div.tableblock > table[frame="hsides"] {
 276   border-left-style: none;
 277   border-right-style: none;
 278 }
 279 div.tableblock > table[frame="vsides"] {
 280   border-top-style: none;
 281   border-bottom-style: none;
 282 }
 283
 284
 285 div.hdlist {
 286   margin-top: 0.8em;
 287   margin-bottom: 0.8em;
 288 }
 289 div.hdlist tr {
 290   padding-bottom: 15px;
 291 }
 292 dt.hdlist1.strong, td.hdlist1.strong {
 293   font-weight: bold;
 294 }
 295 td.hdlist1 {
 296   vertical-align: top;
 297   font-style: normal;
 298   padding-right: 0.8em;
 299   color: navy;
 300 }
 301 td.hdlist2 {
 302   vertical-align: top;
 303 }
 304 div.hdlist.compact tr {
 305   margin: 0;
 306   padding-bottom: 0;
 307 }
 308
 309 .comment {
 310   background: yellow;
 311 }
 312
 313 @media print {
 314   div#footer-badges { display: none; }
 315 }
 316
 317 div#toctitle {
 318   color: #527bbd;
 319   font-family: sans-serif;
 320   font-size: 1.1em;
 321   font-weight: bold;
 322   margin-top: 1.0em;
 323   margin-bottom: 0.1em;
 324 }
 325
 326 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 327   margin-top: 0;
 328   margin-bottom: 0;
 329 }
 330 div.toclevel2 {
 331   margin-left: 2em;
 332   font-size: 0.9em;
 333 }
 334 div.toclevel3 {
 335   margin-left: 4em;
 336   font-size: 0.9em;
 337 }
 338 div.toclevel4 {
 339   margin-left: 6em;
 340   font-size: 0.9em;
 341 }
 342 /* Overrides for manpage documents */
 343 h1 {
 344   padding-top: 0.5em;
 345   padding-bottom: 0.5em;
 346   border-top: 2px solid silver;
 347   border-bottom: 2px solid silver;
 348 }
 349 h2 {
 350   border-style: none;
 351 }
 352 div.sectionbody {
 353   margin-left: 5%;
 354 }
 355
 356 @media print {
 357   div#toc { display: none; }
 358 }
 359
 360 /* Workarounds for IE6's broken and incomplete CSS2. */
 361
 362 div.sidebar-content {
 363   background: #ffffee;
 364   border: 1px solid silver;
 365   padding: 0.5em;
 366 }
 367 div.sidebar-title, div.image-title {
 368   color: #527bbd;
 369   font-family: sans-serif;
 370   font-weight: bold;
 371   margin-top: 0.0em;
 372   margin-bottom: 0.5em;
 373 }
 374
 375 div.listingblock div.content {
 376   border: 1px solid silver;
 377   background: #f4f4f4;
 378   padding: 0.5em;
 379 }
 380
 381 div.quoteblock-attribution {
 382   padding-top: 0.5em;
 383   text-align: right;
 384 }
 385
 386 div.verseblock-content {
 387   white-space: pre;
 388 }
 389 div.verseblock-attribution {
 390   padding-top: 0.75em;
 391   text-align: left;
 392 }
 393
 394 div.exampleblock-content {
 395   border-left: 2px solid silver;
 396   padding-left: 0.5em;
 397 }
 398
 399 /* IE6 sets dynamically generated links as visited. */
 400 div#toc a:visited { color: blue; }
 401 </style>
 402 </head>
 403 <body>
 404 <div id="header">
 405 <h1>
 406 git-cherry-pick(1) Manual Page
 407 </h1>
 408 <h2>NAME</h2>
 409 <div class="sectionbody">
 410 <p>git-cherry-pick -
 411    Apply the changes introduced by some existing commits
 412 </p>
 413 </div>
 414 </div>
 415 <h2 id="_synopsis">SYNOPSIS</h2>
 416 <div class="sectionbody">
 417 <div class="paragraph"><p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;</p></div>
 418 </div>
 419 <h2 id="_description">DESCRIPTION</h2>
 420 <div class="sectionbody">
 421 <div class="paragraph"><p>Given one or more existing commits, apply the change each one
 422 introduces, recording a new commit for each.  This requires your
 423 working tree to be clean (no modifications from the HEAD commit).</p></div>
 424 </div>
 425 <h2 id="_options">OPTIONS</h2>
 426 <div class="sectionbody">
 427 <div class="dlist"><dl>
 428 <dt class="hdlist1">
 429 &lt;commit&gt;&#8230;
 430 </dt>
 431 <dd>
 432 <p>
 433         Commits to cherry-pick.
 434         For a more complete list of ways to spell commits, see
 435         <a href="gitrevisions.html">gitrevisions(7)</a>.
 436         Sets of commits can be passed but no traversal is done by
 437         default, as if the <em>--no-walk</em> option was specified, see
 438         <a href="git-rev-list.html">git-rev-list(1)</a>.
 439 </p>
 440 </dd>
 441 <dt class="hdlist1">
 442 -e
 443 </dt>
 444 <dt class="hdlist1">
 445 --edit
 446 </dt>
 447 <dd>
 448 <p>
 449         With this option, <em>git cherry-pick</em> will let you edit the commit
 450         message prior to committing.
 451 </p>
 452 </dd>
 453 <dt class="hdlist1">
 454 -x
 455 </dt>
 456 <dd>
 457 <p>
 458         When recording the commit, append to the original commit
 459         message a note that indicates which commit this change
 460         was cherry-picked from.  Append the note only for cherry
 461         picks without conflicts.  Do not use this option if
 462         you are cherry-picking from your private branch because
 463         the information is useless to the recipient.  If on the
 464         other hand you are cherry-picking between two publicly
 465         visible branches (e.g. backporting a fix to a
 466         maintenance branch for an older release from a
 467         development branch), adding this information can be
 468         useful.
 469 </p>
 470 </dd>
 471 <dt class="hdlist1">
 472 -r
 473 </dt>
 474 <dd>
 475 <p>
 476         It used to be that the command defaulted to do <tt>-x</tt>
 477         described above, and <tt>-r</tt> was to disable it.  Now the
 478         default is not to do <tt>-x</tt> so this option is a no-op.
 479 </p>
 480 </dd>
 481 <dt class="hdlist1">
 482 -m parent-number
 483 </dt>
 484 <dt class="hdlist1">
 485 --mainline parent-number
 486 </dt>
 487 <dd>
 488 <p>
 489         Usually you cannot cherry-pick a merge because you do not know which
 490         side of the merge should be considered the mainline.  This
 491         option specifies the parent number (starting from 1) of
 492         the mainline and allows cherry-pick to replay the change
 493         relative to the specified parent.
 494 </p>
 495 </dd>
 496 <dt class="hdlist1">
 497 -n
 498 </dt>
 499 <dt class="hdlist1">
 500 --no-commit
 501 </dt>
 502 <dd>
 503 <p>
 504         Usually the command automatically creates a sequence of commits.
 505         This flag applies the changes necessary to cherry-pick
 506         each named commit to your working tree and the index,
 507         without making any commit.  In addition, when this
 508         option is used, your index does not have to match the
 509         HEAD commit.  The cherry-pick is done against the
 510         beginning state of your index.
 511 </p>
 512 <div class="paragraph"><p>This is useful when cherry-picking more than one commits'
 513 effect to your index in a row.</p></div>
 514 </dd>
 515 <dt class="hdlist1">
 516 -s
 517 </dt>
 518 <dt class="hdlist1">
 519 --signoff
 520 </dt>
 521 <dd>
 522 <p>
 523         Add Signed-off-by line at the end of the commit message.
 524 </p>
 525 </dd>
 526 <dt class="hdlist1">
 527 --ff
 528 </dt>
 529 <dd>
 530 <p>
 531         If the current HEAD is the same as the parent of the
 532         cherry-pick&#8217;ed commit, then a fast forward to this commit will
 533         be performed.
 534 </p>
 535 </dd>
 536 </dl></div>
 537 </div>
 538 <h2 id="_examples">EXAMPLES</h2>
 539 <div class="sectionbody">
 540 <div class="dlist"><dl>
 541 <dt class="hdlist1">
 542 git cherry-pick master
 543 </dt>
 544 <dd>
 545 <p>
 546         Apply the change introduced by the commit at the tip of the
 547         master branch and create a new commit with this change.
 548 </p>
 549 </dd>
 550 <dt class="hdlist1">
 551 git cherry-pick ..master
 552 </dt>
 553 <dt class="hdlist1">
 554 git cherry-pick ^HEAD master
 555 </dt>
 556 <dd>
 557 <p>
 558         Apply the changes introduced by all commits that are ancestors
 559         of master but not of HEAD to produce new commits.
 560 </p>
 561 </dd>
 562 <dt class="hdlist1">
 563 git cherry-pick master&#126;4 master&#126;2
 564 </dt>
 565 <dd>
 566 <p>
 567         Apply the changes introduced by the fifth and third last
 568         commits pointed to by master and create 2 new commits with
 569         these changes.
 570 </p>
 571 </dd>
 572 <dt class="hdlist1">
 573 git cherry-pick -n master~1 next
 574 </dt>
 575 <dd>
 576 <p>
 577         Apply to the working tree and the index the changes introduced
 578         by the second last commit pointed to by master and by the last
 579         commit pointed to by next, but do not create any commit with
 580         these changes.
 581 </p>
 582 </dd>
 583 <dt class="hdlist1">
 584 git cherry-pick --ff ..next
 585 </dt>
 586 <dd>
 587 <p>
 588         If history is linear and HEAD is an ancestor of next, update
 589         the working tree and advance the HEAD pointer to match next.
 590         Otherwise, apply the changes introduced by those commits that
 591         are in next but not HEAD to the current branch, creating a new
 592         commit for each new change.
 593 </p>
 594 </dd>
 595 <dt class="hdlist1">
 596 git rev-list --reverse master -- README | git cherry-pick -n --stdin
 597 </dt>
 598 <dd>
 599 <p>
 600         Apply the changes introduced by all commits on the master
 601         branch that touched README to the working tree and index,
 602         so the result can be inspected and made into a single new
 603         commit if suitable.
 604 </p>
 605 </dd>
 606 </dl></div>
 607 </div>
 608 <h2 id="_author">Author</h2>
 609 <div class="sectionbody">
 610 <div class="paragraph"><p>Written by Junio C Hamano &lt;<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>&gt;</p></div>
 611 </div>
 612 <h2 id="_documentation">Documentation</h2>
 613 <div class="sectionbody">
 614 <div class="paragraph"><p>Documentation by Junio C Hamano and the git-list &lt;<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>&gt;.</p></div>
 615 </div>
 616 <h2 id="_see_also">SEE ALSO</h2>
 617 <div class="sectionbody">
 618 <div class="paragraph"><p><a href="git-revert.html">git-revert(1)</a></p></div>
 619 </div>
 620 <h2 id="_git">GIT</h2>
 621 <div class="sectionbody">
 622 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 623 </div>
 624 <div id="footer">
 625 <div id="footer-text">
 626 Last updated 2010-12-03 00:43:00 UTC
 627 </div>
 628 </div>
 629 </body>
 630 </html>