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