| blob | 370598c67bf559a47cbc65c7da568eaffd67d0bd |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-cherry-pick(1) Manual Page
407 </h1>
410 <p>git-cherry-pick -
411 Apply the changes introduced by some existing commits
412 </p>
413 </div>
414 </div>
417 <div class="paragraph"><p><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>…</p></div>
418 </div>
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>
425 happens:</p></div>
427 <li>
428 <p>
430 successfully made.
431 </p>
432 </li>
433 <li>
434 <p>
436 introduced the change that is difficult to apply.
437 </p>
438 </li>
439 <li>
440 <p>
441 Paths in which the change applied cleanly are updated both
442 in the index file and in your working tree.
443 </p>
444 </li>
445 <li>
446 <p>
447 For conflicting paths, the index file records up to three
448 versions, as described in the "TRUE MERGE" section of
450 a description of the conflict bracketed by the usual
451 conflict markers <tt><<<<<<<</tt> and <tt>>>>>>>></tt>.
452 </p>
453 </li>
454 <li>
455 <p>
456 No other modifications are made.
457 </p>
458 </li>
459 </ol></div>
460 <div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
461 conflicts.</p></div>
462 </div>
468 </dt>
469 <dd>
470 <p>
471 Commits to cherry-pick.
472 For a more complete list of ways to spell commits, see
474 Sets of commits can be passed but no traversal is done by
477 </p>
478 </dd>
480 -e
481 </dt>
483 --edit
484 </dt>
485 <dd>
486 <p>
488 message prior to committing.
489 </p>
490 </dd>
492 -x
493 </dt>
494 <dd>
495 <p>
496 When recording the commit, append to the original commit
497 message a note that indicates which commit this change
498 was cherry-picked from. Append the note only for cherry
499 picks without conflicts. Do not use this option if
500 you are cherry-picking from your private branch because
501 the information is useless to the recipient. If on the
502 other hand you are cherry-picking between two publicly
503 visible branches (e.g. backporting a fix to a
504 maintenance branch for an older release from a
505 development branch), adding this information can be
506 useful.
507 </p>
508 </dd>
510 -r
511 </dt>
512 <dd>
513 <p>
517 </p>
518 </dd>
520 -m parent-number
521 </dt>
523 --mainline parent-number
524 </dt>
525 <dd>
526 <p>
527 Usually you cannot cherry-pick a merge because you do not know which
528 side of the merge should be considered the mainline. This
529 option specifies the parent number (starting from 1) of
530 the mainline and allows cherry-pick to replay the change
531 relative to the specified parent.
532 </p>
533 </dd>
535 -n
536 </dt>
538 --no-commit
539 </dt>
540 <dd>
541 <p>
542 Usually the command automatically creates a sequence of commits.
543 This flag applies the changes necessary to cherry-pick
544 each named commit to your working tree and the index,
545 without making any commit. In addition, when this
546 option is used, your index does not have to match the
547 HEAD commit. The cherry-pick is done against the
548 beginning state of your index.
549 </p>
551 effect to your index in a row.</p></div>
552 </dd>
554 -s
555 </dt>
557 --signoff
558 </dt>
559 <dd>
560 <p>
561 Add Signed-off-by line at the end of the commit message.
562 </p>
563 </dd>
565 --ff
566 </dt>
567 <dd>
568 <p>
569 If the current HEAD is the same as the parent of the
570 cherry-pick’ed commit, then a fast forward to this commit will
571 be performed.
572 </p>
573 </dd>
576 </dt>
577 <dd>
578 <p>
579 Use the given merge strategy. Should only be used once.
581 for details.
582 </p>
583 </dd>
586 </dt>
589 </dt>
590 <dd>
591 <p>
592 Pass the merge strategy-specific option through to the
594 </p>
595 </dd>
596 </dl></div>
597 </div>
602 git cherry-pick master
603 </dt>
604 <dd>
605 <p>
606 Apply the change introduced by the commit at the tip of the
607 master branch and create a new commit with this change.
608 </p>
609 </dd>
611 git cherry-pick ..master
612 </dt>
614 git cherry-pick ^HEAD master
615 </dt>
616 <dd>
617 <p>
618 Apply the changes introduced by all commits that are ancestors
619 of master but not of HEAD to produce new commits.
620 </p>
621 </dd>
624 </dt>
625 <dd>
626 <p>
627 Apply the changes introduced by the fifth and third last
628 commits pointed to by master and create 2 new commits with
629 these changes.
630 </p>
631 </dd>
633 git cherry-pick -n master~1 next
634 </dt>
635 <dd>
636 <p>
637 Apply to the working tree and the index the changes introduced
638 by the second last commit pointed to by master and by the last
639 commit pointed to by next, but do not create any commit with
640 these changes.
641 </p>
642 </dd>
644 git cherry-pick --ff ..next
645 </dt>
646 <dd>
647 <p>
648 If history is linear and HEAD is an ancestor of next, update
649 the working tree and advance the HEAD pointer to match next.
650 Otherwise, apply the changes introduced by those commits that
651 are in next but not HEAD to the current branch, creating a new
652 commit for each new change.
653 </p>
654 </dd>
656 git rev-list --reverse master -- README | git cherry-pick -n --stdin
657 </dt>
658 <dd>
659 <p>
660 Apply the changes introduced by all commits on the master
661 branch that touched README to the working tree and index,
662 so the result can be inspected and made into a single new
663 commit if suitable.
664 </p>
665 </dd>
666 </dl></div>
667 <div class="paragraph"><p>The following sequence attempts to backport a patch, bails out because
668 the code the patch applies to has changed too much, and then tries
669 again, this time exercising more care about matching up context lines.</p></div>
676 </div></div>
678 <li>
679 <p>
681 In this example, the patch does not apply cleanly, so
682 information about the conflict is written to the index and
683 working tree and no new commit results.
684 </p>
685 </li>
686 <li>
687 <p>
688 summarize changes to be reconciled
689 </p>
690 </li>
691 <li>
692 <p>
693 cancel the cherry-pick. In other words, return to the
694 pre-cherry-pick state, preserving any local modifications you had in
695 the working tree.
696 </p>
697 </li>
698 <li>
699 <p>
701 spending extra time to avoid mistakes based on incorrectly matching
702 context lines.
703 </p>
704 </li>
705 </ol></div>
706 </div>
710 </div>
714 </div>
718 </div>
719 </div>
720 </body>
721 </html>