git-cherry-pick.html

   1 <!DOCTYPE html>
   2 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   3 <head>
   4 <meta charset="UTF-8"/>
   5 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   6 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
   7 <meta name="generator" content="Asciidoctor 2.0.20"/>
   8 <title>git-cherry-pick(1)</title>
   9 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"/>
  10 <style>
  11 /*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
  12 /* Uncomment the following line when using as a custom stylesheet */
  13 /* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"; */
  14 html{font-family:sans-serif;-webkit-text-size-adjust:100%}
  15 a{background:none}
  16 a:focus{outline:thin dotted}
  17 a:active,a:hover{outline:0}
  18 h1{font-size:2em;margin:.67em 0}
  19 b,strong{font-weight:bold}
  20 abbr{font-size:.9em}
  21 abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
  22 dfn{font-style:italic}
  23 hr{height:0}
  24 mark{background:#ff0;color:#000}
  25 code,kbd,pre,samp{font-family:monospace;font-size:1em}
  26 pre{white-space:pre-wrap}
  27 q{quotes:"\201C" "\201D" "\2018" "\2019"}
  28 small{font-size:80%}
  29 sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
  30 sup{top:-.5em}
  31 sub{bottom:-.25em}
  32 img{border:0}
  33 svg:not(:root){overflow:hidden}
  34 figure{margin:0}
  35 audio,video{display:inline-block}
  36 audio:not([controls]){display:none;height:0}
  37 fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
  38 legend{border:0;padding:0}
  39 button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
  40 button,input{line-height:normal}
  41 button,select{text-transform:none}
  42 button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
  43 button[disabled],html input[disabled]{cursor:default}
  44 input[type=checkbox],input[type=radio]{padding:0}
  45 button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
  46 textarea{overflow:auto;vertical-align:top}
  47 table{border-collapse:collapse;border-spacing:0}
  48 *,::before,::after{box-sizing:border-box}
  49 html,body{font-size:100%}
  50 body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
  51 a:hover{cursor:pointer}
  52 img,object,embed{max-width:100%;height:auto}
  53 object,embed{height:100%}
  54 img{-ms-interpolation-mode:bicubic}
  55 .left{float:left!important}
  56 .right{float:right!important}
  57 .text-left{text-align:left!important}
  58 .text-right{text-align:right!important}
  59 .text-center{text-align:center!important}
  60 .text-justify{text-align:justify!important}
  61 .hide{display:none}
  62 img,object,svg{display:inline-block;vertical-align:middle}
  63 textarea{height:auto;min-height:50px}
  64 select{width:100%}
  65 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
  66 div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
  67 a{color:#2156a5;text-decoration:underline;line-height:inherit}
  68 a:hover,a:focus{color:#1d4b8f}
  69 a img{border:0}
  70 p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
  71 p aside{font-size:.875em;line-height:1.35;font-style:italic}
  72 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
  73 h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
  74 h1{font-size:2.125em}
  75 h2{font-size:1.6875em}
  76 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
  77 h4,h5{font-size:1.125em}
  78 h6{font-size:1em}
  79 hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
  80 em,i{font-style:italic;line-height:inherit}
  81 strong,b{font-weight:bold;line-height:inherit}
  82 small{font-size:60%;line-height:inherit}
  83 code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
  84 ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
  85 ul,ol{margin-left:1.5em}
  86 ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
  87 ul.circle{list-style-type:circle}
  88 ul.disc{list-style-type:disc}
  89 ul.square{list-style-type:square}
  90 ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
  91 ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
  92 dl dt{margin-bottom:.3125em;font-weight:bold}
  93 dl dd{margin-bottom:1.25em}
  94 blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
  95 blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
  96 @media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
  97 h1{font-size:2.75em}
  98 h2{font-size:2.3125em}
  99 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 100 h4{font-size:1.4375em}}
 101 table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
 102 table thead,table tfoot{background:#f7f8f7}
 103 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 104 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 105 table tr.even,table tr.alt{background:#f8f8f7}
 106 table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 107 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 108 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
 109 .center{margin-left:auto;margin-right:auto}
 110 .stretch{width:100%}
 111 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 112 .clearfix::after,.float-group::after{clear:both}
 113 :not(pre).nobreak{word-wrap:normal}
 114 :not(pre).nowrap{white-space:nowrap}
 115 :not(pre).pre-wrap{white-space:pre-wrap}
 116 :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 117 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 118 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 119 pre>code{display:block}
 120 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
 121 em em{font-style:normal}
 122 strong strong{font-weight:400}
 123 .keyseq{color:rgba(51,51,51,.8)}
 124 kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 0 rgba(0,0,0,.2),inset 0 0 0 .1em #fff;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
 125 .keyseq kbd:first-child{margin-left:0}
 126 .keyseq kbd:last-child{margin-right:0}
 127 .menuseq,.menuref{color:#000}
 128 .menuseq b:not(.caret),.menuref{font-weight:inherit}
 129 .menuseq{word-spacing:-.02em}
 130 .menuseq b.caret{font-size:1.25em;line-height:.8}
 131 .menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
 132 b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
 133 b.button::before{content:"[";padding:0 3px 0 2px}
 134 b.button::after{content:"]";padding:0 2px 0 3px}
 135 p a>code:hover{color:rgba(0,0,0,.9)}
 136 #header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
 137 #header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
 138 #header::after,#content::after,#footnotes::after,#footer::after{clear:both}
 139 #content{margin-top:1.25em}
 140 #content::before{content:none}
 141 #header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
 142 #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
 143 #header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
 144 #header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap}
 145 #header .details span:first-child{margin-left:-.125em}
 146 #header .details span.email a{color:rgba(0,0,0,.85)}
 147 #header .details br{display:none}
 148 #header .details br+span::before{content:"\00a0\2013\00a0"}
 149 #header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
 150 #header .details br+span#revremark::before{content:"\00a0|\00a0"}
 151 #header #revnumber{text-transform:capitalize}
 152 #header #revnumber::after{content:"\00a0"}
 153 #content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
 154 #toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
 155 #toc>ul{margin-left:.125em}
 156 #toc ul.sectlevel0>li>a{font-style:italic}
 157 #toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
 158 #toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
 159 #toc li{line-height:1.3334;margin-top:.3334em}
 160 #toc a{text-decoration:none}
 161 #toc a:active{text-decoration:underline}
 162 #toctitle{color:#7a2518;font-size:1.2em}
 163 @media screen and (min-width:768px){#toctitle{font-size:1.375em}
 164 body.toc2{padding-left:15em;padding-right:0}
 165 #toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
 166 #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
 167 #toc.toc2>ul{font-size:.9em;margin-bottom:0}
 168 #toc.toc2 ul ul{margin-left:0;padding-left:1em}
 169 #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
 170 body.toc2.toc-right{padding-left:0;padding-right:15em}
 171 body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
 172 @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
 173 #toc.toc2{width:20em}
 174 #toc.toc2 #toctitle{font-size:1.375em}
 175 #toc.toc2>ul{font-size:.95em}
 176 #toc.toc2 ul ul{padding-left:1.25em}
 177 body.toc2.toc-right{padding-left:0;padding-right:20em}}
 178 #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px}
 179 #content #toc>:first-child{margin-top:0}
 180 #content #toc>:last-child{margin-bottom:0}
 181 #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 182 #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44}
 183 #content{margin-bottom:.625em}
 184 .sect1{padding-bottom:.625em}
 185 @media screen and (min-width:768px){#content{margin-bottom:1.25em}
 186 .sect1{padding-bottom:1.25em}}
 187 .sect1:last-child{padding-bottom:0}
 188 .sect1+.sect1{border-top:1px solid #e7e7e9}
 189 #content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
 190 #content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
 191 #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
 192 #content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
 193 #content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
 194 details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
 195 details{margin-left:1.25rem}
 196 details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
 197 details>summary::-webkit-details-marker{display:none}
 198 details>summary::before{content:"";border:solid transparent;border-left:solid;border-width:.3em 0 .3em .5em;position:absolute;top:.5em;left:-1.25rem;transform:translateX(15%)}
 199 details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
 200 details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem}
 201 .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
 202 table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
 203 .paragraph.lead>p,#preamble>.sectionbody>[class=paragraph]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
 204 .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
 205 .admonitionblock>table td.icon{text-align:center;width:80px}
 206 .admonitionblock>table td.icon img{max-width:none}
 207 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
 208 .admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 209 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 210 .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px}
 211 .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px}
 212 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 213 .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0}
 214 .exampleblock>.content>:last-child,.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
 215 .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 216 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 217 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 218 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
 219 .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
 220 .listingblock>.content{position:relative}
 221 .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
 222 .listingblock:hover code[data-lang]::before{display:block}
 223 .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
 224 .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
 225 .listingblock pre.highlightjs{padding:0}
 226 .listingblock pre.highlightjs>code{padding:1em;border-radius:4px}
 227 .listingblock pre.prettyprint{border-width:0}
 228 .prettyprint{background:#f7f7f8}
 229 pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
 230 pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
 231 pre.prettyprint li code[data-lang]::before{opacity:1}
 232 pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
 233 table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
 234 table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
 235 table.linenotable td.code{padding-left:.75em}
 236 table.linenotable td.linenos,pre.pygments .linenos{border-right:1px solid;opacity:.35;padding-right:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 237 pre.pygments span.linenos{display:inline-block;margin-right:.75em}
 238 .quoteblock{margin:0 1em 1.25em 1.5em;display:table}
 239 .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
 240 .quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
 241 .quoteblock blockquote{margin:0;padding:0;border:0}
 242 .quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
 243 .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
 244 .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
 245 .verseblock{margin:0 1em 1.25em}
 246 .verseblock pre{font-family:"Open Sans","DejaVu Sans",sans-serif;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
 247 .verseblock pre strong{font-weight:400}
 248 .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
 249 .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
 250 .quoteblock .attribution br,.verseblock .attribution br{display:none}
 251 .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
 252 .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
 253 .quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
 254 .quoteblock.abstract{margin:0 1em 1.25em;display:block}
 255 .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
 256 .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
 257 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 258 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 259 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
 260 p.tableblock:last-child{margin-bottom:0}
 261 td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 262 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
 263 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
 264 table.grid-all>*>tr>*{border-width:1px}
 265 table.grid-cols>*>tr>*{border-width:0 1px}
 266 table.grid-rows>*>tr>*{border-width:1px 0}
 267 table.frame-all{border-width:1px}
 268 table.frame-ends{border-width:1px 0}
 269 table.frame-sides{border-width:0 1px}
 270 table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
 271 table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
 272 table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
 273 table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 274 table.stripes-all>*>tr,table.stripes-odd>*>tr:nth-of-type(odd),table.stripes-even>*>tr:nth-of-type(even),table.stripes-hover>*>tr:hover{background:#f8f8f7}
 275 th.halign-left,td.halign-left{text-align:left}
 276 th.halign-right,td.halign-right{text-align:right}
 277 th.halign-center,td.halign-center{text-align:center}
 278 th.valign-top,td.valign-top{vertical-align:top}
 279 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 280 th.valign-middle,td.valign-middle{vertical-align:middle}
 281 table thead th,table tfoot th{font-weight:bold}
 282 tbody tr th{background:#f7f8f7}
 283 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 284 p.tableblock>code:only-child{background:none;padding:0}
 285 p.tableblock{font-size:1em}
 286 ol{margin-left:1.75em}
 287 ul li ol{margin-left:1.5em}
 288 dl dd{margin-left:1.125em}
 289 dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
 290 li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
 291 ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
 292 ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
 293 ul.unstyled,ol.unstyled{margin-left:0}
 294 li>p:empty:only-child::before{content:"";display:inline-block}
 295 ul.checklist>li>p:first-child{margin-left:-1em}
 296 ul.checklist>li>p:first-child>.fa-square-o:first-child,ul.checklist>li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
 297 ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
 298 ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
 299 ul.inline>li{margin-left:1.25em}
 300 .unstyled dl dt{font-weight:400;font-style:normal}
 301 ol.arabic{list-style-type:decimal}
 302 ol.decimal{list-style-type:decimal-leading-zero}
 303 ol.loweralpha{list-style-type:lower-alpha}
 304 ol.upperalpha{list-style-type:upper-alpha}
 305 ol.lowerroman{list-style-type:lower-roman}
 306 ol.upperroman{list-style-type:upper-roman}
 307 ol.lowergreek{list-style-type:lower-greek}
 308 .hdlist>table,.colist>table{border:0;background:none}
 309 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 310 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 311 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
 312 td.hdlist2{word-wrap:anywhere}
 313 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 314 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 315 .colist td:not([class]):first-child img{max-width:none}
 316 .colist td:not([class]):last-child{padding:.25em 0}
 317 .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd}
 318 .imageblock.left{margin:.25em .625em 1.25em 0}
 319 .imageblock.right{margin:.25em 0 1.25em .625em}
 320 .imageblock>.title{margin-bottom:0}
 321 .imageblock.thumb,.imageblock.th{border-width:6px}
 322 .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
 323 .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
 324 .image.left{margin-right:.625em}
 325 .image.right{margin-left:.625em}
 326 a.image{text-decoration:none;display:inline-block}
 327 a.image object{pointer-events:none}
 328 sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
 329 sup.footnote a,sup.footnoteref a{text-decoration:none}
 330 sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
 331 #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
 332 #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
 333 #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
 334 #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
 335 #footnotes .footnote:last-of-type{margin-bottom:0}
 336 #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
 337 div.unbreakable{page-break-inside:avoid}
 338 .big{font-size:larger}
 339 .small{font-size:smaller}
 340 .underline{text-decoration:underline}
 341 .overline{text-decoration:overline}
 342 .line-through{text-decoration:line-through}
 343 .aqua{color:#00bfbf}
 344 .aqua-background{background:#00fafa}
 345 .black{color:#000}
 346 .black-background{background:#000}
 347 .blue{color:#0000bf}
 348 .blue-background{background:#0000fa}
 349 .fuchsia{color:#bf00bf}
 350 .fuchsia-background{background:#fa00fa}
 351 .gray{color:#606060}
 352 .gray-background{background:#7d7d7d}
 353 .green{color:#006000}
 354 .green-background{background:#007d00}
 355 .lime{color:#00bf00}
 356 .lime-background{background:#00fa00}
 357 .maroon{color:#600000}
 358 .maroon-background{background:#7d0000}
 359 .navy{color:#000060}
 360 .navy-background{background:#00007d}
 361 .olive{color:#606000}
 362 .olive-background{background:#7d7d00}
 363 .purple{color:#600060}
 364 .purple-background{background:#7d007d}
 365 .red{color:#bf0000}
 366 .red-background{background:#fa0000}
 367 .silver{color:#909090}
 368 .silver-background{background:#bcbcbc}
 369 .teal{color:#006060}
 370 .teal-background{background:#007d7d}
 371 .white{color:#bfbfbf}
 372 .white-background{background:#fafafa}
 373 .yellow{color:#bfbf00}
 374 .yellow-background{background:#fafa00}
 375 span.icon>.fa{cursor:default}
 376 a span.icon>.fa{cursor:inherit}
 377 .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
 378 .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
 379 .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
 380 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 381 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 382 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
 383 .conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 384 .conum[data-value] *{color:#fff!important}
 385 .conum[data-value]+b{display:none}
 386 .conum[data-value]::after{content:attr(data-value)}
 387 pre .conum[data-value]{position:relative;top:-.125em}
 388 b.conum *{color:inherit!important}
 389 .conum:not([data-value]):empty{display:none}
 390 dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
 391 h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
 392 p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
 393 p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
 394 p{margin-bottom:1.25rem}
 395 .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
 396 .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc}
 397 .print-only{display:none!important}
 398 @page{margin:1.25cm .75cm}
 399 @media print{*{box-shadow:none!important;text-shadow:none!important}
 400 html{font-size:80%}
 401 a{color:inherit!important;text-decoration:underline!important}
 402 a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
 403 a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
 404 abbr[title]{border-bottom:1px dotted}
 405 abbr[title]::after{content:" (" attr(title) ")"}
 406 pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
 407 thead{display:table-header-group}
 408 svg{max-width:100%}
 409 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 410 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
 411 #header,#content,#footnotes,#footer{max-width:none}
 412 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 413 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 414 body.book #header{text-align:center}
 415 body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
 416 body.book #header .details{border:0!important;display:block;padding:0!important}
 417 body.book #header .details span:first-child{margin-left:0!important}
 418 body.book #header .details br{display:block}
 419 body.book #header .details br+span::before{content:none!important}
 420 body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
 421 body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
 422 .listingblock code[data-lang]::before{display:block}
 423 #footer{padding:0 .9375em}
 424 .hide-on-print{display:none!important}
 425 .print-only{display:block!important}
 426 .hide-for-print{display:none!important}
 427 .show-for-print{display:inherit!important}}
 428 @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem}
 429 .sect1{padding:0!important}
 430 .sect1+.sect1{border:0}
 431 #footer{background:none}
 432 #footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
 433 @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
 434 </style>
 435 <style>
 436 pre>code {
 437    display: inline;
 438 }
 439 </style>
 440 </head>
 441 <body class="manpage">
 442 <div id="header">
 443 <h1>git-cherry-pick(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-cherry-pick - Apply the changes introduced by some existing commits</p>
 447 </div>
 448 </div>
 449 <div id="content">
 450 <div class="sect1">
 451 <h2 id="_synopsis">SYNOPSIS</h2>
 452 <div class="sectionbody">
 453 <div class="verseblock">
 454 <pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m &lt;parent-number&gt;] [-s] [-x] [--ff]
 455                   [-S[&lt;keyid&gt;]] &lt;commit&gt;&#8230;&#8203;
 456 <em>git cherry-pick</em> (--continue | --skip | --abort | --quit)</pre>
 457 </div>
 458 </div>
 459 </div>
 460 <div class="sect1">
 461 <h2 id="_description">DESCRIPTION</h2>
 462 <div class="sectionbody">
 463 <div class="paragraph">
 464 <p>Given one or more existing commits, apply the change each one
 465 introduces, recording a new commit for each.  This requires your
 466 working tree to be clean (no modifications from the HEAD commit).</p>
 467 </div>
 468 <div class="paragraph">
 469 <p>When it is not obvious how to apply a change, the following
 470 happens:</p>
 471 </div>
 472 <div class="olist arabic">
 473 <ol class="arabic">
 474 <li>
 475 <p>The current branch and <code>HEAD</code> pointer stay at the last commit
 476 successfully made.</p>
 477 </li>
 478 <li>
 479 <p>The <code>CHERRY_PICK_HEAD</code> ref is set to point at the commit that
 480 introduced the change that is difficult to apply.</p>
 481 </li>
 482 <li>
 483 <p>Paths in which the change applied cleanly are updated both
 484 in the index file and in your working tree.</p>
 485 </li>
 486 <li>
 487 <p>For conflicting paths, the index file records up to three
 488 versions, as described in the "TRUE MERGE" section of
 489 <a href="git-merge.html">git-merge(1)</a>.  The working tree files will include
 490 a description of the conflict bracketed by the usual
 491 conflict markers &lt;&lt;&lt;&lt;&lt;&lt;&lt; and &gt;&gt;&gt;&gt;&gt;&gt;&gt;.</p>
 492 </li>
 493 <li>
 494 <p>No other modifications are made.</p>
 495 </li>
 496 </ol>
 497 </div>
 498 <div class="paragraph">
 499 <p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
 500 conflicts.</p>
 501 </div>
 502 </div>
 503 </div>
 504 <div class="sect1">
 505 <h2 id="_options">OPTIONS</h2>
 506 <div class="sectionbody">
 507 <div class="dlist">
 508 <dl>
 509 <dt class="hdlist1">&lt;commit&gt;&#8230;&#8203;</dt>
 510 <dd>
 511 <p>Commits to cherry-pick.
 512 For a more complete list of ways to spell commits, see
 513 <a href="gitrevisions.html">gitrevisions(7)</a>.
 514 Sets of commits can be passed but no traversal is done by
 515 default, as if the <code>--no-walk</code> option was specified, see
 516 <a href="git-rev-list.html">git-rev-list(1)</a>. Note that specifying a range will
 517 feed all &lt;commit&gt;&#8230;&#8203; arguments to a single revision walk
 518 (see a later example that uses <em>maint master..next</em>).</p>
 519 </dd>
 520 <dt class="hdlist1">-e</dt>
 521 <dt class="hdlist1">--edit</dt>
 522 <dd>
 523 <p>With this option, <em>git cherry-pick</em> will let you edit the commit
 524 message prior to committing.</p>
 525 </dd>
 526 <dt class="hdlist1">--cleanup=&lt;mode&gt;</dt>
 527 <dd>
 528 <p>This option determines how the commit message will be cleaned up before
 529 being passed on to the commit machinery. See <a href="git-commit.html">git-commit(1)</a> for more
 530 details. In particular, if the <em>&lt;mode&gt;</em> is given a value of <code>scissors</code>,
 531 scissors will be appended to <code>MERGE_MSG</code> before being passed on in the case
 532 of a conflict.</p>
 533 </dd>
 534 <dt class="hdlist1">-x</dt>
 535 <dd>
 536 <p>When recording the commit, append a line that says
 537 "(cherry picked from commit &#8230;&#8203;)" to the original commit
 538 message in order to indicate which commit this change was
 539 cherry-picked from.  This is done only for cherry
 540 picks without conflicts.  Do not use this option if
 541 you are cherry-picking from your private branch because
 542 the information is useless to the recipient.  If on the
 543 other hand you are cherry-picking between two publicly
 544 visible branches (e.g. backporting a fix to a
 545 maintenance branch for an older release from a
 546 development branch), adding this information can be
 547 useful.</p>
 548 </dd>
 549 <dt class="hdlist1">-r</dt>
 550 <dd>
 551 <p>It used to be that the command defaulted to do <code>-x</code>
 552 described above, and <code>-r</code> was to disable it.  Now the
 553 default is not to do <code>-x</code> so this option is a no-op.</p>
 554 </dd>
 555 <dt class="hdlist1">-m &lt;parent-number&gt;</dt>
 556 <dt class="hdlist1">--mainline &lt;parent-number&gt;</dt>
 557 <dd>
 558 <p>Usually you cannot cherry-pick a merge because you do not know which
 559 side of the merge should be considered the mainline.  This
 560 option specifies the parent number (starting from 1) of
 561 the mainline and allows cherry-pick to replay the change
 562 relative to the specified parent.</p>
 563 </dd>
 564 <dt class="hdlist1">-n</dt>
 565 <dt class="hdlist1">--no-commit</dt>
 566 <dd>
 567 <p>Usually the command automatically creates a sequence of commits.
 568 This flag applies the changes necessary to cherry-pick
 569 each named commit to your working tree and the index,
 570 without making any commit.  In addition, when this
 571 option is used, your index does not have to match the
 572 HEAD commit.  The cherry-pick is done against the
 573 beginning state of your index.</p>
 574 <div class="paragraph">
 575 <p>This is useful when cherry-picking more than one commits'
 576 effect to your index in a row.</p>
 577 </div>
 578 </dd>
 579 <dt class="hdlist1">-s</dt>
 580 <dt class="hdlist1">--signoff</dt>
 581 <dd>
 582 <p>Add a <code>Signed-off-by</code> trailer at the end of the commit message.
 583 See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.</p>
 584 </dd>
 585 <dt class="hdlist1">-S[&lt;keyid&gt;]</dt>
 586 <dt class="hdlist1">--gpg-sign[=&lt;keyid&gt;]</dt>
 587 <dt class="hdlist1">--no-gpg-sign</dt>
 588 <dd>
 589 <p>GPG-sign commits. The <code>keyid</code> argument is optional and
 590 defaults to the committer identity; if specified, it must be
 591 stuck to the option without a space. <code>--no-gpg-sign</code> is useful to
 592 countermand both <code>commit.gpgSign</code> configuration variable, and
 593 earlier <code>--gpg-sign</code>.</p>
 594 </dd>
 595 <dt class="hdlist1">--ff</dt>
 596 <dd>
 597 <p>If the current HEAD is the same as the parent of the
 598 cherry-pick&#8217;ed commit, then a fast forward to this commit will
 599 be performed.</p>
 600 </dd>
 601 <dt class="hdlist1">--allow-empty</dt>
 602 <dd>
 603 <p>By default, cherry-picking an empty commit will fail,
 604 indicating that an explicit invocation of <code>git</code> <code>commit</code>
 605 <code>--allow-empty</code> is required. This option overrides that
 606 behavior, allowing empty commits to be preserved automatically
 607 in a cherry-pick. Note that when "--ff" is in effect, empty
 608 commits that meet the "fast-forward" requirement will be kept
 609 even without this option.  Note also, that use of this option only
 610 keeps commits that were initially empty (i.e. the commit recorded the
 611 same tree as its parent).  Commits which are made empty due to a
 612 previous commit will cause the cherry-pick to fail.  To force the
 613 inclusion of those commits, use <code>--empty=keep</code>.</p>
 614 </dd>
 615 <dt class="hdlist1">--allow-empty-message</dt>
 616 <dd>
 617 <p>By default, cherry-picking a commit with an empty message will fail.
 618 This option overrides that behavior, allowing commits with empty
 619 messages to be cherry picked.</p>
 620 </dd>
 621 <dt class="hdlist1">--empty=(drop|keep|stop)</dt>
 622 <dd>
 623 <p>How to handle commits being cherry-picked that are redundant with
 624 changes already in the current history.</p>
 625 <div class="openblock">
 626 <div class="content">
 627 <div class="dlist">
 628 <dl>
 629 <dt class="hdlist1"><code>drop</code></dt>
 630 <dd>
 631 <p>The commit will be dropped.</p>
 632 </dd>
 633 <dt class="hdlist1"><code>keep</code></dt>
 634 <dd>
 635 <p>The commit will be kept. Implies <code>--allow-empty</code>.</p>
 636 </dd>
 637 <dt class="hdlist1"><code>stop</code></dt>
 638 <dd>
 639 <p>The cherry-pick will stop when the commit is applied, allowing
 640 you to examine the commit. This is the default behavior.</p>
 641 </dd>
 642 </dl>
 643 </div>
 644 </div>
 645 </div>
 646 <div class="paragraph">
 647 <p>Note that <code>--empty=drop</code> and <code>--empty=stop</code> only specify how to handle a
 648 commit that was not initially empty, but rather became empty due to a previous
 649 commit. Commits that were initially empty will still cause the cherry-pick to
 650 fail unless one of <code>--empty=keep</code> or <code>--allow-empty</code> are specified.</p>
 651 </div>
 652 </dd>
 653 <dt class="hdlist1">--keep-redundant-commits</dt>
 654 <dd>
 655 <p>Deprecated synonym for <code>--empty=keep</code>.</p>
 656 </dd>
 657 <dt class="hdlist1">--strategy=&lt;strategy&gt;</dt>
 658 <dd>
 659 <p>Use the given merge strategy.  Should only be used once.
 660 See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
 661 for details.</p>
 662 </dd>
 663 <dt class="hdlist1">-X&lt;option&gt;</dt>
 664 <dt class="hdlist1">--strategy-option=&lt;option&gt;</dt>
 665 <dd>
 666 <p>Pass the merge strategy-specific option through to the
 667 merge strategy.  See <a href="git-merge.html">git-merge(1)</a> for details.</p>
 668 </dd>
 669 <dt class="hdlist1">--rerere-autoupdate</dt>
 670 <dt class="hdlist1">--no-rerere-autoupdate</dt>
 671 <dd>
 672 <p>After the rerere mechanism reuses a recorded resolution on
 673 the current conflict to update the files in the working
 674 tree, allow it to also update the index with the result of
 675 resolution.  <code>--no-rerere-autoupdate</code> is a good way to
 676 double-check what <code>rerere</code> did and catch potential
 677 mismerges, before committing the result to the index with a
 678 separate <code>git</code> <code>add</code>.</p>
 679 </dd>
 680 </dl>
 681 </div>
 682 </div>
 683 </div>
 684 <div class="sect1">
 685 <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
 686 <div class="sectionbody">
 687 <div class="dlist">
 688 <dl>
 689 <dt class="hdlist1">--continue</dt>
 690 <dd>
 691 <p>Continue the operation in progress using the information in
 692 .<code>git/sequencer</code>.  Can be used to continue after resolving
 693 conflicts in a failed cherry-pick or revert.</p>
 694 </dd>
 695 <dt class="hdlist1">--skip</dt>
 696 <dd>
 697 <p>Skip the current commit and continue with the rest of the
 698 sequence.</p>
 699 </dd>
 700 <dt class="hdlist1">--quit</dt>
 701 <dd>
 702 <p>Forget about the current operation in progress.  Can be used
 703 to clear the sequencer state after a failed cherry-pick or
 704 revert.</p>
 705 </dd>
 706 <dt class="hdlist1">--abort</dt>
 707 <dd>
 708 <p>Cancel the operation and return to the pre-sequence state.</p>
 709 </dd>
 710 </dl>
 711 </div>
 712 </div>
 713 </div>
 714 <div class="sect1">
 715 <h2 id="_examples">EXAMPLES</h2>
 716 <div class="sectionbody">
 717 <div class="dlist">
 718 <dl>
 719 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>master</code></dt>
 720 <dd>
 721 <p>Apply the change introduced by the commit at the tip of the
 722 master branch and create a new commit with this change.</p>
 723 </dd>
 724 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>..</code><code>master</code></dt>
 725 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>^HEAD</code> <code>master</code></dt>
 726 <dd>
 727 <p>Apply the changes introduced by all commits that are ancestors
 728 of master but not of HEAD to produce new commits.</p>
 729 </dd>
 730 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>maint</code> <code>next</code> <code>^master</code></dt>
 731 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>maint</code> <code>master</code><code>..</code><code>next</code></dt>
 732 <dd>
 733 <p>Apply the changes introduced by all commits that are
 734 ancestors of maint or next, but not master or any of its
 735 ancestors.  Note that the latter does not mean <code>maint</code> and
 736 everything between <code>master</code> and <code>next</code>; specifically,
 737 <code>maint</code> will not be used if it is included in <code>master</code>.</p>
 738 </dd>
 739 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>master~4</code> <code>master~2</code></dt>
 740 <dd>
 741 <p>Apply the changes introduced by the fifth and third last
 742 commits pointed to by master and create 2 new commits with
 743 these changes.</p>
 744 </dd>
 745 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>-n</code> <code>master~1</code> <code>next</code></dt>
 746 <dd>
 747 <p>Apply to the working tree and the index the changes introduced
 748 by the second last commit pointed to by master and by the last
 749 commit pointed to by next, but do not create any commit with
 750 these changes.</p>
 751 </dd>
 752 <dt class="hdlist1"><code>git</code> <code>cherry-pick</code> <code>--ff</code> <code>..</code><code>next</code></dt>
 753 <dd>
 754 <p>If history is linear and HEAD is an ancestor of next, update
 755 the working tree and advance the HEAD pointer to match next.
 756 Otherwise, apply the changes introduced by those commits that
 757 are in next but not HEAD to the current branch, creating a new
 758 commit for each new change.</p>
 759 </dd>
 760 <dt class="hdlist1"><code>git</code> <code>rev-list</code> <code>--reverse</code> <code>master</code> <code>--</code> <code>README</code> | <code>git</code> <code>cherry-pick</code> <code>-n</code> <code>--stdin</code></dt>
 761 <dd>
 762 <p>Apply the changes introduced by all commits on the master
 763 branch that touched README to the working tree and index,
 764 so the result can be inspected and made into a single new
 765 commit if suitable.</p>
 766 </dd>
 767 </dl>
 768 </div>
 769 <div class="paragraph">
 770 <p>The following sequence attempts to backport a patch, bails out because
 771 the code the patch applies to has changed too much, and then tries
 772 again, this time exercising more care about matching up context lines.</p>
 773 </div>
 774 <div class="listingblock">
 775 <div class="content">
 776 <pre>$ git cherry-pick topic^             <b class="conum">(1)</b>
 777 $ git diff                           <b class="conum">(2)</b>
 778 $ git cherry-pick --abort            <b class="conum">(3)</b>
 779 $ git cherry-pick -Xpatience topic^  <b class="conum">(4)</b></pre>
 780 </div>
 781 </div>
 782 <div class="colist arabic">
 783 <ol>
 784 <li>
 785 <p>apply the change that would be shown by <code>git</code> <code>show</code> <code>topic^</code>.
 786 In this example, the patch does not apply cleanly, so
 787 information about the conflict is written to the index and
 788 working tree and no new commit results.</p>
 789 </li>
 790 <li>
 791 <p>summarize changes to be reconciled</p>
 792 </li>
 793 <li>
 794 <p>cancel the cherry-pick.  In other words, return to the
 795 pre-cherry-pick state, preserving any local modifications
 796 you had in the working tree.</p>
 797 </li>
 798 <li>
 799 <p>try to apply the change introduced by <code>topic^</code> again,
 800 spending extra time to avoid mistakes based on incorrectly
 801 matching context lines.</p>
 802 </li>
 803 </ol>
 804 </div>
 805 </div>
 806 </div>
 807 <div class="sect1">
 808 <h2 id="_see_also">SEE ALSO</h2>
 809 <div class="sectionbody">
 810 <div class="paragraph">
 811 <p><a href="git-revert.html">git-revert(1)</a></p>
 812 </div>
 813 </div>
 814 </div>
 815 <div class="sect1">
 816 <h2 id="_git">GIT</h2>
 817 <div class="sectionbody">
 818 <div class="paragraph">
 819 <p>Part of the <a href="git.html">git(1)</a> suite</p>
 820 </div>
 821 </div>
 822 </div>
 823 </div>
 824 <div id="footer">
 825 <div id="footer-text">
 826 Last updated 2024-04-03 15:35:56 -0700
 827 </div>
 828 </div>
 829 </body>
 830 </html>