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">
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">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
245 list-style-type: upper-roman
;
248 div
.compact ul
, div
.compact ol
,
249 div
.compact p
, div
.compact p
,
250 div
.compact div
, div
.compact div
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
275 div
.tableblock
> table
[frame
="hsides"] {
276 border-left-style: none
;
277 border-right-style: none
;
279 div
.tableblock
> table
[frame
="vsides"] {
280 border-top-style: none
;
281 border-bottom-style: none
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Overrides for manpage documents */
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver
;
347 border-bottom: 2px solid silver
;
357 div#toc
{ display: none
; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div
.sidebar-content
{
364 border: 1px solid silver
;
367 div
.sidebar-title
, div
.image-title
{
369 font-family: sans-serif
;
372 margin-bottom: 0.5em;
375 div
.listingblock div
.content
{
376 border: 1px solid silver
;
381 div
.quoteblock-attribution
{
386 div
.verseblock-content
{
389 div
.verseblock-attribution
{
394 div
.exampleblock-content
{
395 border-left: 2px solid silver
;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc
a:visited
{ color: blue
; }
406 git-cherry-pick(
1) Manual Page
409 <div class=
"sectionbody">
411 Apply the changes introduced by some existing commits
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]
<commit
>…</p></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>
425 <h2 id=
"_options">OPTIONS
</h2>
426 <div class=
"sectionbody">
427 <div class=
"dlist"><dl>
429 <commit
>…
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>.
449 With this option,
<em>git cherry-pick
</em> will let you edit the commit
450 message prior to committing.
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
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.
485 --mainline parent-number
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.
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.
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>
523 Add Signed-off-by line at the end of the commit message.
531 If the current HEAD is the same as the parent of the
532 cherry-pick
’ed commit, then a fast forward to this commit will
537 --strategy=
<strategy
>
541 Use the given merge strategy. Should only be used once.
542 See the MERGE STRATEGIES section in
<a href=
"git-merge.html">git-merge(
1)
</a>
550 --strategy-option=
<option
>
554 Pass the merge strategy-specific option through to the
555 merge strategy. See
<a href=
"git-merge.html">git-merge(
1)
</a> for details.
560 <h2 id=
"_examples">EXAMPLES
</h2>
561 <div class=
"sectionbody">
562 <div class=
"dlist"><dl>
564 git cherry-pick master
568 Apply the change introduced by the commit at the tip of the
569 master branch and create a new commit with this change.
573 git cherry-pick ..master
576 git cherry-pick ^HEAD master
580 Apply the changes introduced by all commits that are ancestors
581 of master but not of HEAD to produce new commits.
585 git cherry-pick master
~4 master
~2
589 Apply the changes introduced by the fifth and third last
590 commits pointed to by master and create
2 new commits with
595 git cherry-pick -n master~
1 next
599 Apply to the working tree and the index the changes introduced
600 by the second last commit pointed to by master and by the last
601 commit pointed to by next, but do not create any commit with
606 git cherry-pick --ff ..next
610 If history is linear and HEAD is an ancestor of next, update
611 the working tree and advance the HEAD pointer to match next.
612 Otherwise, apply the changes introduced by those commits that
613 are in next but not HEAD to the current branch, creating a new
614 commit for each new change.
618 git rev-list --reverse master -- README | git cherry-pick -n --stdin
622 Apply the changes introduced by all commits on the master
623 branch that touched README to the working tree and index,
624 so the result can be inspected and made into a single new
629 <div class=
"paragraph"><p>The following sequence attempts to backport a patch, bails out because
630 the code the patch applies to has changed too much, and then tries
631 again, this time exercising more care about matching up context lines.
</p></div>
632 <div class=
"listingblock">
633 <div class=
"content">
634 <pre><tt>$ git cherry-pick topic^
<b><1></b>
635 $ git diff
<b><2></b>
636 $ git reset --merge ORIG_HEAD
<b><3></b>
637 $ git cherry-pick -Xpatience topic^
<b><4></b></tt></pre>
639 <div class=
"colist arabic"><ol>
642 apply the change that would be shown by
<tt>git show topic^
</tt>.
643 In this example, the patch does not apply cleanly, so
644 information about the conflict is written to the index and
645 working tree and no new commit results.
650 summarize changes to be reconciled
655 cancel the cherry-pick. In other words, return to the
656 pre-cherry-pick state, preserving any local modifications you had in
662 try to apply the change introduced by
<tt>topic^
</tt> again,
663 spending extra time to avoid mistakes based on incorrectly matching
669 <h2 id=
"_author">Author
</h2>
670 <div class=
"sectionbody">
671 <div class=
"paragraph"><p>Written by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>></p></div>
673 <h2 id=
"_documentation">Documentation
</h2>
674 <div class=
"sectionbody">
675 <div class=
"paragraph"><p>Documentation by Junio C Hamano and the git-list
<<a href=
"mailto:git@vger.kernel.org">git@vger.kernel.org
</a>>.
</p></div>
677 <h2 id=
"_see_also">SEE ALSO
</h2>
678 <div class=
"sectionbody">
679 <div class=
"paragraph"><p><a href=
"git-revert.html">git-revert(
1)
</a></p></div>
681 <h2 id=
"_git">GIT
</h2>
682 <div class=
"sectionbody">
683 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
686 <div id=
"footer-text">
687 Last updated
2011-
02-
10 02:
03:
21 UTC