Google Git
Sign in
chromium / external / gitster / git-htmldocs / e5fc3c3d3c68e038cd67539941b9f354a78f7132 / . / git-cherry-pick.html
blob: 1f91b4966135c05c20e134e05e9713e4da56df50 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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" />
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-cherry-pick(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]30 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]35 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, 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
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]50h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]90 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]91}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 font-family: sans-serif;
96}
97
98div#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}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]182
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194
195div.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}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]285
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]302}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.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
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351div#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
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]429 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var 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.
459toc: 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
526footnotes: 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>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573git-cherry-pick(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-cherry-pick -
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]578 Apply the changes introduced by some existing commits
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]584<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]585<div class="verseblock">
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]586<div class="verseblock-content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]587<em>git cherry-pick</em> --continue
588<em>git cherry-pick</em> --quit
589<em>git cherry-pick</em> --abort</div>
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]590<div class="verseblock-attribution">
591</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]592</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]593<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]594<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]595<div class="paragraph"><p>Given one or more existing commits, apply the change each one
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]596introduces, recording a new commit for each. This requires your
597working tree to be clean (no modifications from the HEAD commit).</p></div>
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]598<div class="paragraph"><p>When it is not obvious how to apply a change, the following
599happens:</p></div>
600<div class="olist arabic"><ol class="arabic">
601<li>
602<p>
603The current branch and <tt>HEAD</tt> pointer stay at the last commit
604 successfully made.
605</p>
606</li>
607<li>
608<p>
609The <tt>CHERRY_PICK_HEAD</tt> ref is set to point at the commit that
610 introduced the change that is difficult to apply.
611</p>
612</li>
613<li>
614<p>
615Paths in which the change applied cleanly are updated both
616 in the index file and in your working tree.
617</p>
618</li>
619<li>
620<p>
621For conflicting paths, the index file records up to three
622 versions, as described in the "TRUE MERGE" section of
623 <a href="git-merge.html">git-merge(1)</a>. The working tree files will include
624 a description of the conflict bracketed by the usual
625 conflict markers <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> and <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt>.
626</p>
627</li>
628<li>
629<p>
630No other modifications are made.
631</p>
632</li>
633</ol></div>
634<div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
635conflicts.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]636</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]637<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]638<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]639<div class="dlist"><dl>
640<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]641&lt;commit&gt;&#8230;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]642</dt>
643<dd>
644<p>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]645 Commits to cherry-pick.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]646 For a more complete list of ways to spell commits, see
Junio C Hamanoc27b7332010-10-14 04:37:28[diff] [blame]647 <a href="gitrevisions.html">gitrevisions(7)</a>.
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]648 Sets of commits can be passed but no traversal is done by
649 default, as if the <em>--no-walk</em> option was specified, see
650 <a href="git-rev-list.html">git-rev-list(1)</a>.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]651</p>
652</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]653<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]654-e
655</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]656<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]657--edit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]658</dt>
659<dd>
660<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]661 With this option, <em>git cherry-pick</em> will let you edit the commit
Junio C Hamano0e661132008-01-21 02:37:44[diff] [blame]662 message prior to committing.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]663</p>
664</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]665<dt class="hdlist1">
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]666-x
667</dt>
668<dd>
669<p>
Junio C Hamanob77f8192011-05-05 01:30:38[diff] [blame]670 When recording the commit, append a line that says
671 "(cherry picked from commit &#8230;)" to the original commit
672 message in order to indicate which commit this change was
673 cherry-picked from. This is done only for cherry
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]674 picks without conflicts. Do not use this option if
675 you are cherry-picking from your private branch because
676 the information is useless to the recipient. If on the
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]677 other hand you are cherry-picking between two publicly
678 visible branches (e.g. backporting a fix to a
679 maintenance branch for an older release from a
680 development branch), adding this information can be
681 useful.
682</p>
683</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]684<dt class="hdlist1">
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]685-r
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]686</dt>
687<dd>
688<p>
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]689 It used to be that the command defaulted to do <tt>-x</tt>
690 described above, and <tt>-r</tt> was to disable it. Now the
691 default is not to do <tt>-x</tt> so this option is a no-op.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]692</p>
693</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]694<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]695-m parent-number
696</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]697<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]698--mainline parent-number
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]699</dt>
700<dd>
701<p>
Junio C Hamano69a98582008-03-01 18:42:18[diff] [blame]702 Usually you cannot cherry-pick a merge because you do not know which
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]703 side of the merge should be considered the mainline. This
704 option specifies the parent number (starting from 1) of
705 the mainline and allows cherry-pick to replay the change
706 relative to the specified parent.
707</p>
708</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]709<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]710-n
711</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]712<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]713--no-commit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]714</dt>
715<dd>
716<p>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]717 Usually the command automatically creates a sequence of commits.
718 This flag applies the changes necessary to cherry-pick
719 each named commit to your working tree and the index,
720 without making any commit. In addition, when this
Junio C Hamano8dae8cd2008-11-24 05:38:55[diff] [blame]721 option is used, your index does not have to match the
722 HEAD commit. The cherry-pick is done against the
Junio C Hamanof69a0a02008-07-17 08:08:47[diff] [blame]723 beginning state of your index.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]724</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]725<div class="paragraph"><p>This is useful when cherry-picking more than one commits'
Junio C Hamanof69a0a02008-07-17 08:08:47[diff] [blame]726effect to your index in a row.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]727</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]728<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]729-s
730</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]731<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]732--signoff
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]733</dt>
734<dd>
735<p>
736 Add Signed-off-by line at the end of the commit message.
737</p>
738</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]739<dt class="hdlist1">
Junio C Hamano961e0522010-03-29 07:49:20[diff] [blame]740--ff
741</dt>
742<dd>
743<p>
744 If the current HEAD is the same as the parent of the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]745 cherry-pick&#8217;ed commit, then a fast forward to this commit will
Junio C Hamano961e0522010-03-29 07:49:20[diff] [blame]746 be performed.
747</p>
748</dd>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]749<dt class="hdlist1">
Junio C Hamano37e389e2012-04-30 22:36:09[diff] [blame]750--allow-empty
751</dt>
752<dd>
753<p>
754 By default, cherry-picking an empty commit will fail,
755 indicating that an explicit invocation of <tt>git commit
756 --allow-empty</tt> is required. This option overrides that
757 behavior, allowing empty commits to be preserved automatically
758 in a cherry-pick. Note that when "--ff" is in effect, empty
759 commits that meet the "fast-forward" requirement will be kept
760 even without this option. Note also, that use of this option only
761 keeps commits that were initially empty (i.e. the commit recorded the
762 same tree as its parent). Commits which are made empty due to a
763 previous commit are dropped. To force the inclusion of those commits
764 use <tt>--keep-redundant-commits</tt>.
765</p>
766</dd>
767<dt class="hdlist1">
768--keep-redundant-commits
769</dt>
770<dd>
771<p>
772 If a commit being cherry picked duplicates a commit already in the
773 current history, it will become empty. By default these
774 redundant commits are ignored. This option overrides that behavior and
775 creates an empty commit object. Implies <tt>--allow-empty</tt>.
776</p>
777</dd>
778<dt class="hdlist1">
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]779--strategy=&lt;strategy&gt;
780</dt>
781<dd>
782<p>
783 Use the given merge strategy. Should only be used once.
784 See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
785 for details.
786</p>
787</dd>
788<dt class="hdlist1">
789-X&lt;option&gt;
790</dt>
791<dt class="hdlist1">
792--strategy-option=&lt;option&gt;
793</dt>
794<dd>
795<p>
796 Pass the merge strategy-specific option through to the
797 merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
798</p>
799</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]800</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]801</div>
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]802<h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
803<div class="sectionbody">
804<div class="dlist"><dl>
805<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]806--continue
807</dt>
808<dd>
809<p>
810 Continue the operation in progress using the information in
811 <em>.git/sequencer</em>. Can be used to continue after resolving
812 conflicts in a failed cherry-pick or revert.
813</p>
814</dd>
815<dt class="hdlist1">
816--quit
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]817</dt>
818<dd>
819<p>
820 Forget about the current operation in progress. Can be used
821 to clear the sequencer state after a failed cherry-pick or
822 revert.
823</p>
824</dd>
825<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]826--abort
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]827</dt>
828<dd>
829<p>
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]830 Cancel the operation and return to the pre-sequence state.
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]831</p>
832</dd>
833</dl></div>
834</div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]835<h2 id="_examples">EXAMPLES</h2>
836<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]837<div class="dlist"><dl>
838<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45[diff] [blame]839<tt>git cherry-pick master</tt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]840</dt>
841<dd>
842<p>
843 Apply the change introduced by the commit at the tip of the
844 master branch and create a new commit with this change.
845</p>
846</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]847<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45[diff] [blame]848<tt>git cherry-pick ..master</tt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]849</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]850<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45[diff] [blame]851<tt>git cherry-pick ^HEAD master</tt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]852</dt>
853<dd>
854<p>
855 Apply the changes introduced by all commits that are ancestors
856 of master but not of HEAD to produce new commits.
857</p>
858</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]859<dt class="hdlist1">
Junio C Hamanob76a6862012-05-02 22:02:46[diff] [blame]860<tt>git cherry-pick master~4 master~2</tt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]861</dt>
862<dd>
863<p>
864 Apply the changes introduced by the fifth and third last
865 commits pointed to by master and create 2 new commits with
866 these changes.
867</p>
868</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]869<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45[diff] [blame]870<tt>git cherry-pick -n master~1 next</tt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]871</dt>
872<dd>
873<p>
874 Apply to the working tree and the index the changes introduced
875 by the second last commit pointed to by master and by the last
876 commit pointed to by next, but do not create any commit with
877 these changes.
878</p>
879</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]880<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45[diff] [blame]881<tt>git cherry-pick --ff ..next</tt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]882</dt>
883<dd>
884<p>
885 If history is linear and HEAD is an ancestor of next, update
886 the working tree and advance the HEAD pointer to match next.
887 Otherwise, apply the changes introduced by those commits that
888 are in next but not HEAD to the current branch, creating a new
889 commit for each new change.
890</p>
891</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]892<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45[diff] [blame]893<tt>git rev-list --reverse master -- README | git cherry-pick -n --stdin</tt>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]894</dt>
895<dd>
896<p>
897 Apply the changes introduced by all commits on the master
898 branch that touched README to the working tree and index,
899 so the result can be inspected and made into a single new
900 commit if suitable.
901</p>
902</dd>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]903</dl></div>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]904<div class="paragraph"><p>The following sequence attempts to backport a patch, bails out because
905the code the patch applies to has changed too much, and then tries
906again, this time exercising more care about matching up context lines.</p></div>
907<div class="listingblock">
908<div class="content">
909<pre><tt>$ git cherry-pick topic^ <b>&lt;1&gt;</b>
910$ git diff <b>&lt;2&gt;</b>
911$ git reset --merge ORIG_HEAD <b>&lt;3&gt;</b>
912$ git cherry-pick -Xpatience topic^ <b>&lt;4&gt;</b></tt></pre>
913</div></div>
914<div class="colist arabic"><ol>
915<li>
916<p>
917apply the change that would be shown by <tt>git show topic^</tt>.
918In this example, the patch does not apply cleanly, so
919information about the conflict is written to the index and
920working tree and no new commit results.
921</p>
922</li>
923<li>
924<p>
925summarize changes to be reconciled
926</p>
927</li>
928<li>
929<p>
930cancel the cherry-pick. In other words, return to the
931pre-cherry-pick state, preserving any local modifications you had in
932the working tree.
933</p>
934</li>
935<li>
936<p>
937try to apply the change introduced by <tt>topic^</tt> again,
938spending extra time to avoid mistakes based on incorrectly matching
939context lines.
940</p>
941</li>
942</ol></div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]943</div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]944<h2 id="_see_also">SEE ALSO</h2>
945<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]946<div class="paragraph"><p><a href="git-revert.html">git-revert(1)</a></p></div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]947</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]948<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]949<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]950<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]951</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]952</div>
953<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]954<div id="footer">
955<div id="footer-text">
Junio C Hamanob76a6862012-05-02 22:02:46[diff] [blame]956Last updated 2012-05-02 15:00:44 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]957</div>
958</div>
959</body>
960</html>