| blob | 1bbfbfc7bb389a66fbb846328338395404a73d70 |
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>
418 <div class="verseblock-content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>…</div>
420 </div></div>
421 </div>
425 introduces, recording a new commit for each. This requires your
426 working tree to be clean (no modifications from the HEAD commit).</p></div>
428 happens:</p></div>
430 <li>
431 <p>
433 successfully made.
434 </p>
435 </li>
436 <li>
437 <p>
439 introduced the change that is difficult to apply.
440 </p>
441 </li>
442 <li>
443 <p>
444 Paths in which the change applied cleanly are updated both
445 in the index file and in your working tree.
446 </p>
447 </li>
448 <li>
449 <p>
450 For conflicting paths, the index file records up to three
451 versions, as described in the "TRUE MERGE" section of
453 a description of the conflict bracketed by the usual
454 conflict markers <tt><<<<<<<</tt> and <tt>>>>>>>></tt>.
455 </p>
456 </li>
457 <li>
458 <p>
459 No other modifications are made.
460 </p>
461 </li>
462 </ol></div>
463 <div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
464 conflicts.</p></div>
465 </div>
471 </dt>
472 <dd>
473 <p>
474 Commits to cherry-pick.
475 For a more complete list of ways to spell commits, see
477 Sets of commits can be passed but no traversal is done by
480 </p>
481 </dd>
483 -e
484 </dt>
486 --edit
487 </dt>
488 <dd>
489 <p>
491 message prior to committing.
492 </p>
493 </dd>
495 -x
496 </dt>
497 <dd>
498 <p>
499 When recording the commit, append a line that says
500 "(cherry picked from commit …)" to the original commit
501 message in order to indicate which commit this change was
502 cherry-picked from. This is done only for cherry
503 picks without conflicts. Do not use this option if
504 you are cherry-picking from your private branch because
505 the information is useless to the recipient. If on the
506 other hand you are cherry-picking between two publicly
507 visible branches (e.g. backporting a fix to a
508 maintenance branch for an older release from a
509 development branch), adding this information can be
510 useful.
511 </p>
512 </dd>
514 -r
515 </dt>
516 <dd>
517 <p>
521 </p>
522 </dd>
524 -m parent-number
525 </dt>
527 --mainline parent-number
528 </dt>
529 <dd>
530 <p>
531 Usually you cannot cherry-pick a merge because you do not know which
532 side of the merge should be considered the mainline. This
533 option specifies the parent number (starting from 1) of
534 the mainline and allows cherry-pick to replay the change
535 relative to the specified parent.
536 </p>
537 </dd>
539 -n
540 </dt>
542 --no-commit
543 </dt>
544 <dd>
545 <p>
546 Usually the command automatically creates a sequence of commits.
547 This flag applies the changes necessary to cherry-pick
548 each named commit to your working tree and the index,
549 without making any commit. In addition, when this
550 option is used, your index does not have to match the
551 HEAD commit. The cherry-pick is done against the
552 beginning state of your index.
553 </p>
555 effect to your index in a row.</p></div>
556 </dd>
558 -s
559 </dt>
561 --signoff
562 </dt>
563 <dd>
564 <p>
565 Add Signed-off-by line at the end of the commit message.
566 </p>
567 </dd>
569 --ff
570 </dt>
571 <dd>
572 <p>
573 If the current HEAD is the same as the parent of the
574 cherry-pick’ed commit, then a fast forward to this commit will
575 be performed.
576 </p>
577 </dd>
580 </dt>
581 <dd>
582 <p>
583 Use the given merge strategy. Should only be used once.
585 for details.
586 </p>
587 </dd>
590 </dt>
593 </dt>
594 <dd>
595 <p>
596 Pass the merge strategy-specific option through to the
598 </p>
599 </dd>
600 </dl></div>
601 </div>
607 </dt>
608 <dd>
609 <p>
610 Apply the change introduced by the commit at the tip of the
611 master branch and create a new commit with this change.
612 </p>
613 </dd>
616 </dt>
619 </dt>
620 <dd>
621 <p>
622 Apply the changes introduced by all commits that are ancestors
623 of master but not of HEAD to produce new commits.
624 </p>
625 </dd>
628 </dt>
629 <dd>
630 <p>
631 Apply the changes introduced by the fifth and third last
632 commits pointed to by master and create 2 new commits with
633 these changes.
634 </p>
635 </dd>
638 </dt>
639 <dd>
640 <p>
641 Apply to the working tree and the index the changes introduced
642 by the second last commit pointed to by master and by the last
643 commit pointed to by next, but do not create any commit with
644 these changes.
645 </p>
646 </dd>
649 </dt>
650 <dd>
651 <p>
652 If history is linear and HEAD is an ancestor of next, update
653 the working tree and advance the HEAD pointer to match next.
654 Otherwise, apply the changes introduced by those commits that
655 are in next but not HEAD to the current branch, creating a new
656 commit for each new change.
657 </p>
658 </dd>
661 </dt>
662 <dd>
663 <p>
664 Apply the changes introduced by all commits on the master
665 branch that touched README to the working tree and index,
666 so the result can be inspected and made into a single new
667 commit if suitable.
668 </p>
669 </dd>
670 </dl></div>
671 <div class="paragraph"><p>The following sequence attempts to backport a patch, bails out because
672 the code the patch applies to has changed too much, and then tries
673 again, this time exercising more care about matching up context lines.</p></div>
680 </div></div>
682 <li>
683 <p>
685 In this example, the patch does not apply cleanly, so
686 information about the conflict is written to the index and
687 working tree and no new commit results.
688 </p>
689 </li>
690 <li>
691 <p>
692 summarize changes to be reconciled
693 </p>
694 </li>
695 <li>
696 <p>
697 cancel the cherry-pick. In other words, return to the
698 pre-cherry-pick state, preserving any local modifications you had in
699 the working tree.
700 </p>
701 </li>
702 <li>
703 <p>
705 spending extra time to avoid mistakes based on incorrectly matching
706 context lines.
707 </p>
708 </li>
709 </ol></div>
710 </div>
714 </div>
718 </div>
722 </div>
723 </div>
724 </body>
725 </html>