Google Git
Sign in
chromium / external / gitster / git-htmldocs / 18a1532395f7adb2f9972cdc8551b3fa13f2a4a4 / . / git-cherry-pick.html
blob: 3ecb66160916116ee8c8154c60b1efb7742e141a [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>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]6<meta name="generator" content="AsciiDoc 8.6.9" />
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">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]9/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]24}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]30a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]37
38em {
39 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]40 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]45 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]46}
47
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]50 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]55h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]56 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59 padding-top: 0.5em;
60}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]61h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]67h5 {
68 font-size: 1.0em;
69}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]70
71div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]72 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]84ul, ol, li > p {
85 margin-top: 0;
86}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]87ul > li { color: #aaa; }
88ul > li > * { color: black; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]89
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]94 padding: 0;
95 margin: 0;
96}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]97pre {
98 white-space: pre-wrap;
99}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]100
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]101#author {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]102 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]103 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]104 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]105}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]106#email {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]107}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]108#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]109}
110
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]111#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]112 font-size: small;
113 border-top: 2px solid silver;
114 padding-top: 0.5em;
115 margin-top: 4.0em;
116}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]117#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118 float: left;
119 padding-bottom: 0.5em;
120}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]121#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 float: right;
123 padding-bottom: 0.5em;
124}
125
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]126#preamble {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]127 margin-top: 1.5em;
128 margin-bottom: 1.5em;
129}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]130div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]131div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
132div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]133 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]134 margin-bottom: 1.5em;
135}
136div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]137 margin-top: 2.0em;
138 margin-bottom: 2.0em;
139 margin-right: 10%;
140 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]141}
142
143div.content { /* Block element content. */
144 padding: 0;
145}
146
147/* Block element titles. */
148div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]149 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]150 font-weight: bold;
151 text-align: left;
152 margin-top: 1.0em;
153 margin-bottom: 0.5em;
154}
155div.title + * {
156 margin-top: 0;
157}
158
159td div.title:first-child {
160 margin-top: 0.0em;
161}
162div.content div.title:first-child {
163 margin-top: 0.0em;
164}
165div.content + div.title {
166 margin-top: 0.0em;
167}
168
169div.sidebarblock > div.content {
170 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]171 border: 1px solid #dddddd;
172 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]173 padding: 0.5em;
174}
175
176div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]177 border: 1px solid #dddddd;
178 border-left: 5px solid #f0f0f0;
179 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 padding: 0.5em;
181}
182
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]183div.quoteblock, div.verseblock {
184 padding-left: 1.0em;
185 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]186 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]187 border-left: 5px solid #f0f0f0;
188 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]189}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]190
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]191div.quoteblock > div.attribution {
192 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]193 text-align: right;
194}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]195
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]196div.verseblock > pre.content {
197 font-family: inherit;
198 font-size: inherit;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]199}
200div.verseblock > div.attribution {
201 padding-top: 0.75em;
202 text-align: left;
203}
204/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]205div.verseblock + div.attribution {
206 text-align: left;
207}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]208
209div.admonitionblock .icon {
210 vertical-align: top;
211 font-size: 1.1em;
212 font-weight: bold;
213 text-decoration: underline;
214 color: #527bbd;
215 padding-right: 0.5em;
216}
217div.admonitionblock td.content {
218 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]219 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221
222div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]223 border-left: 3px solid #dddddd;
224 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]225}
226
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]227div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]228span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]229a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]230
231dl {
232 margin-top: 0.8em;
233 margin-bottom: 0.8em;
234}
235dt {
236 margin-top: 0.5em;
237 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]238 font-style: normal;
239 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]240}
241dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]242 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]243}
244
245ul, ol {
246 list-style-position: outside;
247}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]248ol.arabic {
249 list-style-type: decimal;
250}
251ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]252 list-style-type: lower-alpha;
253}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]254ol.upperalpha {
255 list-style-type: upper-alpha;
256}
257ol.lowerroman {
258 list-style-type: lower-roman;
259}
260ol.upperroman {
261 list-style-type: upper-roman;
262}
263
264div.compact ul, div.compact ol,
265div.compact p, div.compact p,
266div.compact div, div.compact div {
267 margin-top: 0.1em;
268 margin-bottom: 0.1em;
269}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]270
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]271tfoot {
272 font-weight: bold;
273}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]274td > div.verse {
275 white-space: pre;
276}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]277
278div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]279 margin-top: 0.8em;
280 margin-bottom: 0.8em;
281}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]282div.hdlist tr {
283 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]284}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]285dt.hdlist1.strong, td.hdlist1.strong {
286 font-weight: bold;
287}
288td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]289 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]290 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]291 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]292 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]295 vertical-align: top;
296}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]297div.hdlist.compact tr {
298 margin: 0;
299 padding-bottom: 0;
300}
301
302.comment {
303 background: yellow;
304}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]305
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]306.footnote, .footnoteref {
307 font-size: 0.8em;
308}
309
310span.footnote, span.footnoteref {
311 vertical-align: super;
312}
313
314#footnotes {
315 margin: 20px 0 20px 0;
316 padding: 7px 0 0 0;
317}
318
319#footnotes div.footnote {
320 margin: 0 0 5px 0;
321}
322
323#footnotes hr {
324 border: none;
325 border-top: 1px solid silver;
326 height: 1px;
327 text-align: left;
328 margin-left: 0;
329 width: 20%;
330 min-width: 100px;
331}
332
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]333div.colist td {
334 padding-right: 0.5em;
335 padding-bottom: 0.3em;
336 vertical-align: top;
337}
338div.colist td img {
339 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]340}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]341
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]342@media print {
343 #footer-badges { display: none; }
344}
345
346#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347 margin-bottom: 2.5em;
348}
349
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]350#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]352 font-size: 1.1em;
353 font-weight: bold;
354 margin-top: 1.0em;
355 margin-bottom: 0.1em;
356}
357
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]358div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]359 margin-top: 0;
360 margin-bottom: 0;
361}
362div.toclevel2 {
363 margin-left: 2em;
364 font-size: 0.9em;
365}
366div.toclevel3 {
367 margin-left: 4em;
368 font-size: 0.9em;
369}
370div.toclevel4 {
371 margin-left: 6em;
372 font-size: 0.9em;
373}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]374
375span.aqua { color: aqua; }
376span.black { color: black; }
377span.blue { color: blue; }
378span.fuchsia { color: fuchsia; }
379span.gray { color: gray; }
380span.green { color: green; }
381span.lime { color: lime; }
382span.maroon { color: maroon; }
383span.navy { color: navy; }
384span.olive { color: olive; }
385span.purple { color: purple; }
386span.red { color: red; }
387span.silver { color: silver; }
388span.teal { color: teal; }
389span.white { color: white; }
390span.yellow { color: yellow; }
391
392span.aqua-background { background: aqua; }
393span.black-background { background: black; }
394span.blue-background { background: blue; }
395span.fuchsia-background { background: fuchsia; }
396span.gray-background { background: gray; }
397span.green-background { background: green; }
398span.lime-background { background: lime; }
399span.maroon-background { background: maroon; }
400span.navy-background { background: navy; }
401span.olive-background { background: olive; }
402span.purple-background { background: purple; }
403span.red-background { background: red; }
404span.silver-background { background: silver; }
405span.teal-background { background: teal; }
406span.white-background { background: white; }
407span.yellow-background { background: yellow; }
408
409span.big { font-size: 2em; }
410span.small { font-size: 0.6em; }
411
412span.underline { text-decoration: underline; }
413span.overline { text-decoration: overline; }
414span.line-through { text-decoration: line-through; }
415
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]416div.unbreakable { page-break-inside: avoid; }
417
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]418
419/*
420 * xhtml11 specific
421 *
422 * */
423
424div.tableblock {
425 margin-top: 1.0em;
426 margin-bottom: 1.5em;
427}
428div.tableblock > table {
429 border: 3px solid #527bbd;
430}
431thead, p.table.header {
432 font-weight: bold;
433 color: #527bbd;
434}
435p.table {
436 margin-top: 0;
437}
438/* Because the table frame attribute is overriden by CSS in most browsers. */
439div.tableblock > table[frame="void"] {
440 border-style: none;
441}
442div.tableblock > table[frame="hsides"] {
443 border-left-style: none;
444 border-right-style: none;
445}
446div.tableblock > table[frame="vsides"] {
447 border-top-style: none;
448 border-bottom-style: none;
449}
450
451
452/*
453 * html5 specific
454 *
455 * */
456
457table.tableblock {
458 margin-top: 1.0em;
459 margin-bottom: 1.5em;
460}
461thead, p.tableblock.header {
462 font-weight: bold;
463 color: #527bbd;
464}
465p.tableblock {
466 margin-top: 0;
467}
468table.tableblock {
469 border-width: 3px;
470 border-spacing: 0px;
471 border-style: solid;
472 border-color: #527bbd;
473 border-collapse: collapse;
474}
475th.tableblock, td.tableblock {
476 border-width: 1px;
477 padding: 4px;
478 border-style: solid;
479 border-color: #527bbd;
480}
481
482table.tableblock.frame-topbot {
483 border-left-style: hidden;
484 border-right-style: hidden;
485}
486table.tableblock.frame-sides {
487 border-top-style: hidden;
488 border-bottom-style: hidden;
489}
490table.tableblock.frame-none {
491 border-style: hidden;
492}
493
494th.tableblock.halign-left, td.tableblock.halign-left {
495 text-align: left;
496}
497th.tableblock.halign-center, td.tableblock.halign-center {
498 text-align: center;
499}
500th.tableblock.halign-right, td.tableblock.halign-right {
501 text-align: right;
502}
503
504th.tableblock.valign-top, td.tableblock.valign-top {
505 vertical-align: top;
506}
507th.tableblock.valign-middle, td.tableblock.valign-middle {
508 vertical-align: middle;
509}
510th.tableblock.valign-bottom, td.tableblock.valign-bottom {
511 vertical-align: bottom;
512}
513
514
515/*
516 * manpage specific
517 *
518 * */
519
520body.manpage h1 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]521 padding-top: 0.5em;
522 padding-bottom: 0.5em;
523 border-top: 2px solid silver;
524 border-bottom: 2px solid silver;
525}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]526body.manpage h2 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]527 border-style: none;
528}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]529body.manpage div.sectionbody {
530 margin-left: 3em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]531}
532
533@media print {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]534 body.manpage div#toc { display: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]535}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]536
537
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]538</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]539<script type="text/javascript">
540/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]541var asciidoc = { // Namespace.
542
543/////////////////////////////////////////////////////////////////////
544// Table Of Contents generator
545/////////////////////////////////////////////////////////////////////
546
547/* Author: Mihai Bazon, September 2002
548 * http://students.infoiasi.ro/~mishoo
549 *
550 * Table Of Content generator
551 * Version: 0.4
552 *
553 * Feel free to use this script under the terms of the GNU General Public
554 * License, as long as you do not remove or alter this notice.
555 */
556
557 /* modified by Troy D. Hanson, September 2006. License: GPL */
558 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
559
560// toclevels = 1..4.
561toc: function (toclevels) {
562
563 function getText(el) {
564 var text = "";
565 for (var i = el.firstChild; i != null; i = i.nextSibling) {
566 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
567 text += i.data;
568 else if (i.firstChild != null)
569 text += getText(i);
570 }
571 return text;
572 }
573
574 function TocEntry(el, text, toclevel) {
575 this.element = el;
576 this.text = text;
577 this.toclevel = toclevel;
578 }
579
580 function tocEntries(el, toclevels) {
581 var result = new Array;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]582 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]583 // Function that scans the DOM tree for header elements (the DOM2
584 // nodeIterator API would be a better technique but not supported by all
585 // browsers).
586 var iterate = function (el) {
587 for (var i = el.firstChild; i != null; i = i.nextSibling) {
588 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
589 var mo = re.exec(i.tagName);
590 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
591 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
592 }
593 iterate(i);
594 }
595 }
596 }
597 iterate(el);
598 return result;
599 }
600
601 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]602 if (!toc) {
603 return;
604 }
605
606 // Delete existing TOC entries in case we're reloading the TOC.
607 var tocEntriesToRemove = [];
608 var i;
609 for (i = 0; i < toc.childNodes.length; i++) {
610 var entry = toc.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]611 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]612 && entry.getAttribute("class")
613 && entry.getAttribute("class").match(/^toclevel/))
614 tocEntriesToRemove.push(entry);
615 }
616 for (i = 0; i < tocEntriesToRemove.length; i++) {
617 toc.removeChild(tocEntriesToRemove[i]);
618 }
619
620 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]621 var entries = tocEntries(document.getElementById("content"), toclevels);
622 for (var i = 0; i < entries.length; ++i) {
623 var entry = entries[i];
624 if (entry.element.id == "")
625 entry.element.id = "_toc_" + i;
626 var a = document.createElement("a");
627 a.href = "#" + entry.element.id;
628 a.appendChild(document.createTextNode(entry.text));
629 var div = document.createElement("div");
630 div.appendChild(a);
631 div.className = "toclevel" + entry.toclevel;
632 toc.appendChild(div);
633 }
634 if (entries.length == 0)
635 toc.parentNode.removeChild(toc);
636},
637
638
639/////////////////////////////////////////////////////////////////////
640// Footnotes generator
641/////////////////////////////////////////////////////////////////////
642
643/* Based on footnote generation code from:
644 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
645 */
646
647footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]648 // Delete existing footnote entries in case we're reloading the footnodes.
649 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]650 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]651 if (!noteholder) {
652 return;
653 }
654 var entriesToRemove = [];
655 for (i = 0; i < noteholder.childNodes.length; i++) {
656 var entry = noteholder.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]657 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]658 entriesToRemove.push(entry);
659 }
660 for (i = 0; i < entriesToRemove.length; i++) {
661 noteholder.removeChild(entriesToRemove[i]);
662 }
663
664 // Rebuild footnote entries.
665 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]666 var spans = cont.getElementsByTagName("span");
667 var refs = {};
668 var n = 0;
669 for (i=0; i<spans.length; i++) {
670 if (spans[i].className == "footnote") {
671 n++;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]672 var note = spans[i].getAttribute("data-note");
673 if (!note) {
674 // Use [\s\S] in place of . so multi-line matches work.
675 // Because JavaScript has no s (dotall) regex flag.
676 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
677 spans[i].innerHTML =
678 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
679 "' title='View footnote' class='footnote'>" + n + "</a>]";
680 spans[i].setAttribute("data-note", note);
681 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]682 noteholder.innerHTML +=
683 "<div class='footnote' id='_footnote_" + n + "'>" +
684 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
685 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]686 var id =spans[i].getAttribute("id");
687 if (id != null) refs["#"+id] = n;
688 }
689 }
690 if (n == 0)
691 noteholder.parentNode.removeChild(noteholder);
692 else {
693 // Process footnoterefs.
694 for (i=0; i<spans.length; i++) {
695 if (spans[i].className == "footnoteref") {
696 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
697 href = href.match(/#.*/)[0]; // Because IE return full URL.
698 n = refs[href];
699 spans[i].innerHTML =
700 "[<a href='#_footnote_" + n +
701 "' title='View footnote' class='footnote'>" + n + "</a>]";
702 }
703 }
704 }
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]705},
706
707install: function(toclevels) {
708 var timerId;
709
710 function reinstall() {
711 asciidoc.footnotes();
712 if (toclevels) {
713 asciidoc.toc(toclevels);
714 }
715 }
716
717 function reinstallAndRemoveTimer() {
718 clearInterval(timerId);
719 reinstall();
720 }
721
722 timerId = setInterval(reinstall, 500);
723 if (document.addEventListener)
724 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
725 else
726 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]727}
728
729}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]730asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]731/*]]>*/
732</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]733</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]734<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]735<div id="header">
736<h1>
737git-cherry-pick(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-cherry-pick -
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]742 Apply the changes introduced by some existing commits
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]743</p>
744</div>
745</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]746<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]747<div class="sect1">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]748<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]749<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]750<div class="verseblock">
Junio C Hamano5b3533d2014-02-27 23:07:15[diff] [blame]751<pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]752 [-S[&lt;keyid&gt;]] &lt;commit&gt;&#8230;
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]753<em>git cherry-pick</em> --continue
754<em>git cherry-pick</em> --quit
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]755<em>git cherry-pick</em> --abort</pre>
756<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]757</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]758</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]759</div>
760<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]761<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]762<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]763<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]764introduces, recording a new commit for each. This requires your
765working tree to be clean (no modifications from the HEAD commit).</p></div>
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]766<div class="paragraph"><p>When it is not obvious how to apply a change, the following
767happens:</p></div>
768<div class="olist arabic"><ol class="arabic">
769<li>
770<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]771The current branch and <code>HEAD</code> pointer stay at the last commit
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]772 successfully made.
773</p>
774</li>
775<li>
776<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]777The <code>CHERRY_PICK_HEAD</code> ref is set to point at the commit that
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]778 introduced the change that is difficult to apply.
779</p>
780</li>
781<li>
782<p>
783Paths in which the change applied cleanly are updated both
784 in the index file and in your working tree.
785</p>
786</li>
787<li>
788<p>
789For conflicting paths, the index file records up to three
790 versions, as described in the "TRUE MERGE" section of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]791 <a href="git-merge.html">git-merge(1)</a>. The working tree files will include
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]792 a description of the conflict bracketed by the usual
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]793 conflict markers <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> and <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code>.
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]794</p>
795</li>
796<li>
797<p>
798No other modifications are made.
799</p>
800</li>
801</ol></div>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]802<div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
Junio C Hamanoa8cc1d82011-03-10 01:18:12[diff] [blame]803conflicts.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]804</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]805</div>
806<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]807<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]808<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]809<div class="dlist"><dl>
810<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]811&lt;commit&gt;&#8230;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]812</dt>
813<dd>
814<p>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]815 Commits to cherry-pick.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]816 For a more complete list of ways to spell commits, see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]817 <a href="gitrevisions.html">gitrevisions(7)</a>.
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]818 Sets of commits can be passed but no traversal is done by
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]819 default, as if the <code>--no-walk</code> option was specified, see
Junio C Hamano9257a332012-06-25 20:01:02[diff] [blame]820 <a href="git-rev-list.html">git-rev-list(1)</a>. Note that specifying a range will
821 feed all &lt;commit&gt;&#8230; arguments to a single revision walk
822 (see a later example that uses <em>maint master..next</em>).
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]823</p>
824</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]825<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]826-e
827</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]828<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]829--edit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]830</dt>
831<dd>
832<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]833 With this option, <em>git cherry-pick</em> will let you edit the commit
Junio C Hamano0e661132008-01-21 02:37:44[diff] [blame]834 message prior to committing.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]835</p>
836</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]837<dt class="hdlist1">
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]838-x
839</dt>
840<dd>
841<p>
Junio C Hamanob77f8192011-05-05 01:30:38[diff] [blame]842 When recording the commit, append a line that says
843 "(cherry picked from commit &#8230;)" to the original commit
844 message in order to indicate which commit this change was
845 cherry-picked from. This is done only for cherry
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]846 picks without conflicts. Do not use this option if
847 you are cherry-picking from your private branch because
848 the information is useless to the recipient. If on the
Junio C Hamanoaf2b8c52006-10-06 01:00:40[diff] [blame]849 other hand you are cherry-picking between two publicly
850 visible branches (e.g. backporting a fix to a
851 maintenance branch for an older release from a
852 development branch), adding this information can be
853 useful.
854</p>
855</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]856<dt class="hdlist1">
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]857-r
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]858</dt>
859<dd>
860<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]861 It used to be that the command defaulted to do <code>-x</code>
862 described above, and <code>-r</code> was to disable it. Now the
863 default is not to do <code>-x</code> so this option is a no-op.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]864</p>
865</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]866<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]867-m parent-number
868</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]869<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]870--mainline parent-number
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]871</dt>
872<dd>
873<p>
Junio C Hamano69a98582008-03-01 18:42:18[diff] [blame]874 Usually you cannot cherry-pick a merge because you do not know which
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]875 side of the merge should be considered the mainline. This
876 option specifies the parent number (starting from 1) of
877 the mainline and allows cherry-pick to replay the change
878 relative to the specified parent.
879</p>
880</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]881<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]882-n
883</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]884<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]885--no-commit
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]886</dt>
887<dd>
888<p>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]889 Usually the command automatically creates a sequence of commits.
890 This flag applies the changes necessary to cherry-pick
891 each named commit to your working tree and the index,
892 without making any commit. In addition, when this
Junio C Hamano8dae8cd2008-11-24 05:38:55[diff] [blame]893 option is used, your index does not have to match the
894 HEAD commit. The cherry-pick is done against the
Junio C Hamanof69a0a02008-07-17 08:08:47[diff] [blame]895 beginning state of your index.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]896</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]897<div class="paragraph"><p>This is useful when cherry-picking more than one commits'
Junio C Hamanof69a0a02008-07-17 08:08:47[diff] [blame]898effect to your index in a row.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]899</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]900<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]901-s
902</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]903<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]904--signoff
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]905</dt>
906<dd>
907<p>
908 Add Signed-off-by line at the end of the commit message.
Junio C Hamano4e6ba272016-01-20 23:23:19[diff] [blame]909 See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]910</p>
911</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]912<dt class="hdlist1">
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]913-S[&lt;keyid&gt;]
Junio C Hamano5b3533d2014-02-27 23:07:15[diff] [blame]914</dt>
915<dt class="hdlist1">
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]916--gpg-sign[=&lt;keyid&gt;]
Junio C Hamano5b3533d2014-02-27 23:07:15[diff] [blame]917</dt>
918<dd>
919<p>
Junio C Hamano1eb56092015-10-05 20:39:53[diff] [blame]920 GPG-sign commits. The <code>keyid</code> argument is optional and
921 defaults to the committer identity; if specified, it must be
922 stuck to the option without a space.
Junio C Hamano5b3533d2014-02-27 23:07:15[diff] [blame]923</p>
924</dd>
925<dt class="hdlist1">
Junio C Hamano961e0522010-03-29 07:49:20[diff] [blame]926--ff
927</dt>
928<dd>
929<p>
930 If the current HEAD is the same as the parent of the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]931 cherry-pick&#8217;ed commit, then a fast forward to this commit will
Junio C Hamano961e0522010-03-29 07:49:20[diff] [blame]932 be performed.
933</p>
934</dd>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]935<dt class="hdlist1">
Junio C Hamano37e389e2012-04-30 22:36:09[diff] [blame]936--allow-empty
937</dt>
938<dd>
939<p>
940 By default, cherry-picking an empty commit will fail,
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]941 indicating that an explicit invocation of <code>git commit
942 --allow-empty</code> is required. This option overrides that
Junio C Hamano37e389e2012-04-30 22:36:09[diff] [blame]943 behavior, allowing empty commits to be preserved automatically
944 in a cherry-pick. Note that when "--ff" is in effect, empty
945 commits that meet the "fast-forward" requirement will be kept
946 even without this option. Note also, that use of this option only
947 keeps commits that were initially empty (i.e. the commit recorded the
948 same tree as its parent). Commits which are made empty due to a
949 previous commit are dropped. To force the inclusion of those commits
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]950 use <code>--keep-redundant-commits</code>.
Junio C Hamano37e389e2012-04-30 22:36:09[diff] [blame]951</p>
952</dd>
953<dt class="hdlist1">
Junio C Hamanof3353932012-09-04 23:16:51[diff] [blame]954--allow-empty-message
955</dt>
956<dd>
957<p>
958 By default, cherry-picking a commit with an empty message will fail.
Junio C Hamano5213c3b2016-06-03 23:34:40[diff] [blame]959 This option overrides that behavior, allowing commits with empty
Junio C Hamanof3353932012-09-04 23:16:51[diff] [blame]960 messages to be cherry picked.
961</p>
962</dd>
963<dt class="hdlist1">
Junio C Hamano37e389e2012-04-30 22:36:09[diff] [blame]964--keep-redundant-commits
965</dt>
966<dd>
967<p>
968 If a commit being cherry picked duplicates a commit already in the
969 current history, it will become empty. By default these
Junio C Hamanoe35ff422015-04-14 21:45:21[diff] [blame]970 redundant commits cause <code>cherry-pick</code> to stop so the user can
971 examine the commit. This option overrides that behavior and
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]972 creates an empty commit object. Implies <code>--allow-empty</code>.
Junio C Hamano37e389e2012-04-30 22:36:09[diff] [blame]973</p>
974</dd>
975<dt class="hdlist1">
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]976--strategy=&lt;strategy&gt;
977</dt>
978<dd>
979<p>
980 Use the given merge strategy. Should only be used once.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]981 See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]982 for details.
983</p>
984</dd>
985<dt class="hdlist1">
986-X&lt;option&gt;
987</dt>
988<dt class="hdlist1">
989--strategy-option=&lt;option&gt;
990</dt>
991<dd>
992<p>
993 Pass the merge strategy-specific option through to the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]994 merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]995</p>
996</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]997</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]998</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]999</div>
1000<div class="sect1">
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1001<h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
1002<div class="sectionbody">
1003<div class="dlist"><dl>
1004<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]1005--continue
1006</dt>
1007<dd>
1008<p>
1009 Continue the operation in progress using the information in
1010 <em>.git/sequencer</em>. Can be used to continue after resolving
1011 conflicts in a failed cherry-pick or revert.
1012</p>
1013</dd>
1014<dt class="hdlist1">
1015--quit
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1016</dt>
1017<dd>
1018<p>
1019 Forget about the current operation in progress. Can be used
1020 to clear the sequencer state after a failed cherry-pick or
1021 revert.
1022</p>
1023</dd>
1024<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]1025--abort
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1026</dt>
1027<dd>
1028<p>
Junio C Hamanof0944d02011-11-30 20:46:29[diff] [blame]1029 Cancel the operation and return to the pre-sequence state.
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1030</p>
1031</dd>
1032</dl></div>
1033</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1034</div>
1035<div class="sect1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1036<h2 id="_examples">EXAMPLES</h2>
1037<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1038<div class="dlist"><dl>
1039<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1040<code>git cherry-pick master</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1041</dt>
1042<dd>
1043<p>
1044 Apply the change introduced by the commit at the tip of the
1045 master branch and create a new commit with this change.
1046</p>
1047</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1048<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1049<code>git cherry-pick ..master</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1050</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1051<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1052<code>git cherry-pick ^HEAD master</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1053</dt>
1054<dd>
1055<p>
1056 Apply the changes introduced by all commits that are ancestors
1057 of master but not of HEAD to produce new commits.
1058</p>
1059</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1060<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1061<code>git cherry-pick maint next ^master</code>
Junio C Hamano9257a332012-06-25 20:01:02[diff] [blame]1062</dt>
1063<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1064<code>git cherry-pick maint master..next</code>
Junio C Hamano9257a332012-06-25 20:01:02[diff] [blame]1065</dt>
1066<dd>
1067<p>
1068 Apply the changes introduced by all commits that are
1069 ancestors of maint or next, but not master or any of its
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1070 ancestors. Note that the latter does not mean <code>maint</code> and
1071 everything between <code>master</code> and <code>next</code>; specifically,
1072 <code>maint</code> will not be used if it is included in <code>master</code>.
Junio C Hamano9257a332012-06-25 20:01:02[diff] [blame]1073</p>
1074</dd>
1075<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1076<code>git cherry-pick master~4 master~2</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1077</dt>
1078<dd>
1079<p>
1080 Apply the changes introduced by the fifth and third last
1081 commits pointed to by master and create 2 new commits with
1082 these changes.
1083</p>
1084</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1085<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1086<code>git cherry-pick -n master~1 next</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1087</dt>
1088<dd>
1089<p>
1090 Apply to the working tree and the index the changes introduced
1091 by the second last commit pointed to by master and by the last
1092 commit pointed to by next, but do not create any commit with
1093 these changes.
1094</p>
1095</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1096<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1097<code>git cherry-pick --ff ..next</code>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1098</dt>
1099<dd>
1100<p>
1101 If history is linear and HEAD is an ancestor of next, update
1102 the working tree and advance the HEAD pointer to match next.
1103 Otherwise, apply the changes introduced by those commits that
1104 are in next but not HEAD to the current branch, creating a new
1105 commit for each new change.
1106</p>
1107</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1108<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1109<code>git rev-list --reverse master -- README | git cherry-pick -n --stdin</code>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1110</dt>
1111<dd>
1112<p>
1113 Apply the changes introduced by all commits on the master
1114 branch that touched README to the working tree and index,
1115 so the result can be inspected and made into a single new
1116 commit if suitable.
1117</p>
1118</dd>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1119</dl></div>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]1120<div class="paragraph"><p>The following sequence attempts to backport a patch, bails out because
1121the code the patch applies to has changed too much, and then tries
1122again, this time exercising more care about matching up context lines.</p></div>
1123<div class="listingblock">
1124<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1125<pre><code>$ git cherry-pick topic^ <b>&lt;1&gt;</b>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]1126$ git diff <b>&lt;2&gt;</b>
1127$ git reset --merge ORIG_HEAD <b>&lt;3&gt;</b>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1128$ git cherry-pick -Xpatience topic^ <b>&lt;4&gt;</b></code></pre>
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]1129</div></div>
1130<div class="colist arabic"><ol>
1131<li>
1132<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1133apply the change that would be shown by <code>git show topic^</code>.
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]1134In this example, the patch does not apply cleanly, so
1135information about the conflict is written to the index and
1136working tree and no new commit results.
1137</p>
1138</li>
1139<li>
1140<p>
1141summarize changes to be reconciled
1142</p>
1143</li>
1144<li>
1145<p>
1146cancel the cherry-pick. In other words, return to the
1147pre-cherry-pick state, preserving any local modifications you had in
1148the working tree.
1149</p>
1150</li>
1151<li>
1152<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]1153try to apply the change introduced by <code>topic^</code> again,
Junio C Hamano23e3f532011-02-10 02:05:29[diff] [blame]1154spending extra time to avoid mistakes based on incorrectly matching
1155context lines.
1156</p>
1157</li>
1158</ol></div>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1159</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1160</div>
1161<div class="sect1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]1162<h2 id="_see_also">SEE ALSO</h2>
1163<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1164<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]1165</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1166</div>
1167<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1168<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1169<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1170<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]1171</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1172</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1173</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]1174<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1175<div id="footer">
1176<div id="footer-text">
Junio C Hamano92d80372016-07-13 22:00:05[diff] [blame]1177Last updated 2016-07-13 14:58:50 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1178</div>
1179</div>
1180</body>
1181</html>