git-merge-tree.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-merge-tree(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-merge-tree(1) Manual Page</h1>
 444 <h2 id="_name">NAME</h2>
 445 <div class="sectionbody">
 446 <p>git-merge-tree - Perform merge without touching index or working tree</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 merge-tree</em> [--write-tree] [&lt;options&gt;] &lt;branch1&gt; &lt;branch2&gt;
 455 <em>git merge-tree</em> [--trivial-merge] &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt; (deprecated)</pre>
 456 </div>
 457 </div>
 458 </div>
 459 <div class="sect1">
 460 <h2 id="NEWMERGE">DESCRIPTION</h2>
 461 <div class="sectionbody">
 462 <div class="paragraph">
 463 <p>This command has a modern <code>--write-tree</code> mode and a deprecated
 464 <code>--trivial-merge</code> mode.  With the exception of the
 465 <a href="#DEPMERGE">DEPRECATED DESCRIPTION</a> section at the end, the rest of
 466 this documentation describes the modern <code>--write-tree</code> mode.</p>
 467 </div>
 468 <div class="paragraph">
 469 <p>Performs a merge, but does not make any new commits and does not read
 470 from or write to either the working tree or index.</p>
 471 </div>
 472 <div class="paragraph">
 473 <p>The performed merge will use the same features as the "real"
 474 <a href="git-merge.html">git-merge(1)</a>, including:</p>
 475 </div>
 476 <div class="ulist">
 477 <ul>
 478 <li>
 479 <p>three way content merges of individual files</p>
 480 </li>
 481 <li>
 482 <p>rename detection</p>
 483 </li>
 484 <li>
 485 <p>proper directory/file conflict handling</p>
 486 </li>
 487 <li>
 488 <p>recursive ancestor consolidation (i.e. when there is more than one
 489 merge base, creating a virtual merge base by merging the merge bases)</p>
 490 </li>
 491 <li>
 492 <p>etc.</p>
 493 </li>
 494 </ul>
 495 </div>
 496 <div class="paragraph">
 497 <p>After the merge completes, a new toplevel tree object is created.  See
 498 <code>OUTPUT</code> below for details.</p>
 499 </div>
 500 </div>
 501 </div>
 502 <div class="sect1">
 503 <h2 id="_options">OPTIONS</h2>
 504 <div class="sectionbody">
 505 <div class="dlist">
 506 <dl>
 507 <dt class="hdlist1">-z</dt>
 508 <dd>
 509 <p>Do not quote filenames in the &lt;Conflicted file info&gt; section,
 510 and end each filename with a NUL character rather than
 511 newline.  Also begin the messages section with a NUL character
 512 instead of a newline.  See <a href="#OUTPUT">OUTPUT</a> below for more information.</p>
 513 </dd>
 514 <dt class="hdlist1">--name-only</dt>
 515 <dd>
 516 <p>In the Conflicted file info section, instead of writing a list
 517 of (mode, oid, stage, path) tuples to output for conflicted
 518 files, just provide a list of filenames with conflicts (and
 519 do not list filenames multiple times if they have multiple
 520 conflicting stages).</p>
 521 </dd>
 522 <dt class="hdlist1">--[no-]messages</dt>
 523 <dd>
 524 <p>Write any informational messages such as "Auto-merging &lt;path&gt;"
 525 or CONFLICT notices to the end of stdout.  If unspecified, the
 526 default is to include these messages if there are merge
 527 conflicts, and to omit them otherwise.</p>
 528 </dd>
 529 <dt class="hdlist1">--allow-unrelated-histories</dt>
 530 <dd>
 531 <p>merge-tree will by default error out if the two branches specified
 532 share no common history.  This flag can be given to override that
 533 check and make the merge proceed anyway.</p>
 534 </dd>
 535 <dt class="hdlist1">--merge-base=&lt;tree-ish&gt;</dt>
 536 <dd>
 537 <p>Instead of finding the merge-bases for &lt;branch1&gt; and &lt;branch2&gt;,
 538 specify a merge-base for the merge, and specifying multiple bases is
 539 currently not supported. This option is incompatible with <code>--stdin</code>.</p>
 540 <div class="paragraph">
 541 <p>As the merge-base is provided directly, &lt;branch1&gt; and &lt;branch2&gt; do not need
 542 to specify commits; trees are enough.</p>
 543 </div>
 544 </dd>
 545 <dt class="hdlist1">-X&lt;option&gt;</dt>
 546 <dt class="hdlist1">--strategy-option=&lt;option&gt;</dt>
 547 <dd>
 548 <p>Pass the merge strategy-specific option through to the merge strategy.
 549 See <a href="git-merge.html">git-merge(1)</a> for details.</p>
 550 </dd>
 551 </dl>
 552 </div>
 553 </div>
 554 </div>
 555 <div class="sect1">
 556 <h2 id="OUTPUT">OUTPUT</h2>
 557 <div class="sectionbody">
 558 <div class="paragraph">
 559 <p>For a successful merge, the output from git-merge-tree is simply one
 560 line:</p>
 561 </div>
 562 <div class="literalblock">
 563 <div class="content">
 564 <pre>&lt;OID of toplevel tree&gt;</pre>
 565 </div>
 566 </div>
 567 <div class="paragraph">
 568 <p>Whereas for a conflicted merge, the output is by default of the form:</p>
 569 </div>
 570 <div class="literalblock">
 571 <div class="content">
 572 <pre>&lt;OID of toplevel tree&gt;
 573 &lt;Conflicted file info&gt;
 574 &lt;Informational messages&gt;</pre>
 575 </div>
 576 </div>
 577 <div class="paragraph">
 578 <p>These are discussed individually below.</p>
 579 </div>
 580 <div class="paragraph">
 581 <p>However, there is an exception.  If <code>--stdin</code> is passed, then there is
 582 an extra section at the beginning, a NUL character at the end, and then
 583 all the sections repeat for each line of input.  Thus, if the first merge
 584 is conflicted and the second is clean, the output would be of the form:</p>
 585 </div>
 586 <div class="literalblock">
 587 <div class="content">
 588 <pre>&lt;Merge status&gt;
 589 &lt;OID of toplevel tree&gt;
 590 &lt;Conflicted file info&gt;
 591 &lt;Informational messages&gt;
 592 NUL
 593 &lt;Merge status&gt;
 594 &lt;OID of toplevel tree&gt;
 595 NUL</pre>
 596 </div>
 597 </div>
 598 <div class="sect2">
 599 <h3 id="MS">Merge status</h3>
 600 <div class="paragraph">
 601 <p>This is an integer status followed by a NUL character.  The integer status is:</p>
 602 </div>
 603 <div class="literalblock">
 604 <div class="content">
 605 <pre>   0: merge had conflicts
 606    1: merge was clean
 607    &lt;0: something prevented the merge from running (e.g. access to repository
 608 objects denied by filesystem)</pre>
 609 </div>
 610 </div>
 611 </div>
 612 <div class="sect2">
 613 <h3 id="OIDTLT">OID of toplevel tree</h3>
 614 <div class="paragraph">
 615 <p>This is a tree object that represents what would be checked out in the
 616 working tree at the end of <code>git</code> <code>merge</code>.  If there were conflicts, then
 617 files within this tree may have embedded conflict markers.  This section
 618 is always followed by a newline (or NUL if <code>-z</code> is passed).</p>
 619 </div>
 620 </div>
 621 <div class="sect2">
 622 <h3 id="CFI">Conflicted file info</h3>
 623 <div class="paragraph">
 624 <p>This is a sequence of lines with the format</p>
 625 </div>
 626 <div class="literalblock">
 627 <div class="content">
 628 <pre>&lt;mode&gt; &lt;object&gt; &lt;stage&gt; &lt;filename&gt;</pre>
 629 </div>
 630 </div>
 631 <div class="paragraph">
 632 <p>The filename will be quoted as explained for the configuration
 633 variable <code>core.quotePath</code> (see <a href="git-config.html">git-config(1)</a>).  However, if
 634 the <code>--name-only</code> option is passed, the mode, object, and stage will
 635 be omitted.  If <code>-z</code> is passed, the "lines" are terminated by a NUL
 636 character instead of a newline character.</p>
 637 </div>
 638 </div>
 639 <div class="sect2">
 640 <h3 id="IM">Informational messages</h3>
 641 <div class="paragraph">
 642 <p>This section provides informational messages, typically about
 643 conflicts.  The format of the section varies significantly depending
 644 on whether <code>-z</code> is passed.</p>
 645 </div>
 646 <div class="paragraph">
 647 <p>If <code>-z</code> is passed:</p>
 648 </div>
 649 <div class="paragraph">
 650 <p>The output format is zero or more conflict informational records, each
 651 of the form:</p>
 652 </div>
 653 <div class="literalblock">
 654 <div class="content">
 655 <pre>&lt;list-of-paths&gt;&lt;conflict-type&gt;NUL&lt;conflict-message&gt;NUL</pre>
 656 </div>
 657 </div>
 658 <div class="paragraph">
 659 <p>where &lt;list-of-paths&gt; is of the form</p>
 660 </div>
 661 <div class="literalblock">
 662 <div class="content">
 663 <pre>&lt;number-of-paths&gt;NUL&lt;path1&gt;NUL&lt;path2&gt;NUL...&lt;pathN&gt;NUL</pre>
 664 </div>
 665 </div>
 666 <div class="paragraph">
 667 <p>and includes paths (or branch names) affected by the conflict or
 668 informational message in &lt;conflict-message&gt;.  Also, &lt;conflict-type&gt; is a
 669 stable string explaining the type of conflict, such as</p>
 670 </div>
 671 <div class="ulist">
 672 <ul>
 673 <li>
 674 <p>"Auto-merging"</p>
 675 </li>
 676 <li>
 677 <p>"CONFLICT (rename/delete)"</p>
 678 </li>
 679 <li>
 680 <p>"CONFLICT (submodule lacks merge base)"</p>
 681 </li>
 682 <li>
 683 <p>"CONFLICT (binary)"</p>
 684 </li>
 685 </ul>
 686 </div>
 687 <div class="paragraph">
 688 <p>and &lt;conflict-message&gt; is a more detailed message about the conflict which often
 689 (but not always) embeds the &lt;stable-short-type-description&gt; within it.  These
 690 strings may change in future Git versions.  Some examples:</p>
 691 </div>
 692 <div class="ulist">
 693 <ul>
 694 <li>
 695 <p>"Auto-merging &lt;file&gt;"</p>
 696 </li>
 697 <li>
 698 <p>"CONFLICT (rename/delete): &lt;oldfile&gt; renamed&#8230;&#8203;but deleted in&#8230;&#8203;"</p>
 699 </li>
 700 <li>
 701 <p>"Failed to merge submodule &lt;submodule&gt; (no merge base)"</p>
 702 </li>
 703 <li>
 704 <p>"Warning: cannot merge binary files: &lt;filename&gt;"</p>
 705 </li>
 706 </ul>
 707 </div>
 708 <div class="paragraph">
 709 <p>If <code>-z</code> is NOT passed:</p>
 710 </div>
 711 <div class="paragraph">
 712 <p>This section starts with a blank line to separate it from the previous
 713 sections, and then only contains the &lt;conflict-message&gt; information
 714 from the previous section (separated by newlines).  These are
 715 non-stable strings that should not be parsed by scripts, and are just
 716 meant for human consumption.  Also, note that while &lt;conflict-message&gt;
 717 strings usually do not contain embedded newlines, they sometimes do.
 718 (However, the free-form messages will never have an embedded NUL
 719 character).  So, the entire block of information is meant for human
 720 readers as an agglomeration of all conflict messages.</p>
 721 </div>
 722 </div>
 723 </div>
 724 </div>
 725 <div class="sect1">
 726 <h2 id="_exit_status">EXIT STATUS</h2>
 727 <div class="sectionbody">
 728 <div class="paragraph">
 729 <p>For a successful, non-conflicted merge, the exit status is 0.  When the
 730 merge has conflicts, the exit status is 1.  If the merge is not able to
 731 complete (or start) due to some kind of error, the exit status is
 732 something other than 0 or 1 (and the output is unspecified).  When
 733 --stdin is passed, the return status is 0 for both successful and
 734 conflicted merges, and something other than 0 or 1 if it cannot complete
 735 all the requested merges.</p>
 736 </div>
 737 </div>
 738 </div>
 739 <div class="sect1">
 740 <h2 id="_usage_notes">USAGE NOTES</h2>
 741 <div class="sectionbody">
 742 <div class="paragraph">
 743 <p>This command is intended as low-level plumbing, similar to
 744 <a href="git-hash-object.html">git-hash-object(1)</a>, <a href="git-mktree.html">git-mktree(1)</a>,
 745 <a href="git-commit-tree.html">git-commit-tree(1)</a>, <a href="git-write-tree.html">git-write-tree(1)</a>,
 746 <a href="git-update-ref.html">git-update-ref(1)</a>, and <a href="git-mktag.html">git-mktag(1)</a>.  Thus, it can be
 747 used as a part of a series of steps such as:</p>
 748 </div>
 749 <div class="literalblock">
 750 <div class="content">
 751 <pre>vi message.txt
 752 BRANCH1=refs/heads/test
 753 BRANCH2=main
 754 NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) || {
 755     echo "There were conflicts..." 1&gt;&amp;2
 756     exit 1
 757 }
 758 NEWCOMMIT=$(git commit-tree $NEWTREE -F message.txt \
 759     -p $BRANCH1 -p $BRANCH2)
 760 git update-ref $BRANCH1 $NEWCOMMIT</pre>
 761 </div>
 762 </div>
 763 <div class="paragraph">
 764 <p>Note that when the exit status is non-zero, <code>NEWTREE</code> in this sequence
 765 will contain a lot more output than just a tree.</p>
 766 </div>
 767 <div class="paragraph">
 768 <p>For conflicts, the output includes the same information that you&#8217;d get
 769 with <a href="git-merge.html">git-merge(1)</a>:</p>
 770 </div>
 771 <div class="ulist">
 772 <ul>
 773 <li>
 774 <p>what would be written to the working tree (the
 775 <a href="#OIDTLT">OID of toplevel tree</a>)</p>
 776 </li>
 777 <li>
 778 <p>the higher order stages that would be written to the index (the
 779 <a href="#CFI">Conflicted file info</a>)</p>
 780 </li>
 781 <li>
 782 <p>any messages that would have been printed to stdout (the
 783 <a href="#IM">Informational messages</a>)</p>
 784 </li>
 785 </ul>
 786 </div>
 787 </div>
 788 </div>
 789 <div class="sect1">
 790 <h2 id="_input_format">INPUT FORMAT</h2>
 791 <div class="sectionbody">
 792 <div class="paragraph">
 793 <p><em>git merge-tree --stdin</em> input format is fully text based. Each line
 794 has this format:</p>
 795 </div>
 796 <div class="literalblock">
 797 <div class="content">
 798 <pre>[&lt;base-commit&gt; -- ]&lt;branch1&gt; &lt;branch2&gt;</pre>
 799 </div>
 800 </div>
 801 <div class="paragraph">
 802 <p>If one line is separated by <code>--</code>, the string before the separator is
 803 used for specifying a merge-base for the merge and the string after
 804 the separator describes the branches to be merged.</p>
 805 </div>
 806 </div>
 807 </div>
 808 <div class="sect1">
 809 <h2 id="_mistakes_to_avoid">MISTAKES TO AVOID</h2>
 810 <div class="sectionbody">
 811 <div class="paragraph">
 812 <p>Do NOT look through the resulting toplevel tree to try to find which
 813 files conflict; parse the <a href="#CFI">Conflicted file info</a> section instead.
 814 Not only would parsing an entire tree be horrendously slow in large
 815 repositories, there are numerous types of conflicts not representable by
 816 conflict markers (modify/delete, mode conflict, binary file changed on
 817 both sides, file/directory conflicts, various rename conflict
 818 permutations, etc.)</p>
 819 </div>
 820 <div class="paragraph">
 821 <p>Do NOT interpret an empty <a href="#CFI">Conflicted file info</a> list as a clean
 822 merge; check the exit status.  A merge can have conflicts without having
 823 individual files conflict (there are a few types of directory rename
 824 conflicts that fall into this category, and others might also be added
 825 in the future).</p>
 826 </div>
 827 <div class="paragraph">
 828 <p>Do NOT attempt to guess or make the user guess the conflict types from
 829 the <a href="#CFI">Conflicted file info</a> list.  The information there is
 830 insufficient to do so.  For example: Rename/rename(1to2) conflicts (both
 831 sides renamed the same file differently) will result in three different
 832 files having higher order stages (but each only has one higher order
 833 stage), with no way (short of the <a href="#IM">Informational messages</a> section)
 834 to determine which three files are related.  File/directory conflicts
 835 also result in a file with exactly one higher order stage.
 836 Possibly-involved-in-directory-rename conflicts (when
 837 "merge.directoryRenames" is unset or set to "conflicts") also result in
 838 a file with exactly one higher order stage.  In all cases, the
 839 <a href="#IM">Informational messages</a> section has the necessary info, though it
 840 is not designed to be machine parseable.</p>
 841 </div>
 842 <div class="paragraph">
 843 <p>Do NOT assume that each path from <a href="#CFI">Conflicted file info</a>, and
 844 the logical conflicts in the <a href="#IM">Informational messages</a> have a
 845 one-to-one mapping, nor that there is a one-to-many mapping, nor a
 846 many-to-one mapping.  Many-to-many mappings exist, meaning that each
 847 path can have many logical conflict types in a single merge, and each
 848 logical conflict type can affect many paths.</p>
 849 </div>
 850 <div class="paragraph">
 851 <p>Do NOT assume all filenames listed in the <a href="#IM">Informational messages</a>
 852 section had conflicts.  Messages can be included for files that have no
 853 conflicts, such as "Auto-merging &lt;file&gt;".</p>
 854 </div>
 855 <div class="paragraph">
 856 <p>AVOID taking the OIDS from the <a href="#CFI">Conflicted file info</a> and
 857 re-merging them to present the conflicts to the user.  This will lose
 858 information.  Instead, look up the version of the file found within the
 859 <a href="#OIDTLT">OID of toplevel tree</a> and show that instead.  In particular,
 860 the latter will have conflict markers annotated with the original
 861 branch/commit being merged and, if renames were involved, the original
 862 filename.  While you could include the original branch/commit in the
 863 conflict marker annotations when re-merging, the original filename is
 864 not available from the <a href="#CFI">Conflicted file info</a> and thus you would
 865 be losing information that might help the user resolve the conflict.</p>
 866 </div>
 867 </div>
 868 </div>
 869 <div class="sect1">
 870 <h2 id="DEPMERGE">DEPRECATED DESCRIPTION</h2>
 871 <div class="sectionbody">
 872 <div class="paragraph">
 873 <p>Per the <a href="#NEWMERGE">DESCRIPTION</a> and unlike the rest of this
 874 documentation, this section describes the deprecated <code>--trivial-merge</code>
 875 mode.</p>
 876 </div>
 877 <div class="paragraph">
 878 <p>Other than the optional <code>--trivial-merge</code>, this mode accepts no
 879 options.</p>
 880 </div>
 881 <div class="paragraph">
 882 <p>This mode reads three tree-ish, and outputs trivial merge results and
 883 conflicting stages to the standard output in a semi-diff format.
 884 Since this was designed for higher level scripts to consume and merge
 885 the results back into the index, it omits entries that match
 886 &lt;branch1&gt;.  The result of this second form is similar to what
 887 three-way <em>git read-tree -m</em> does, but instead of storing the results
 888 in the index, the command outputs the entries to the standard output.</p>
 889 </div>
 890 <div class="paragraph">
 891 <p>This form not only has limited applicability (a trivial merge cannot
 892 handle content merges of individual files, rename detection, proper
 893 directory/file conflict handling, etc.), the output format is also
 894 difficult to work with, and it will generally be less performant than
 895 the first form even on successful merges (especially if working in
 896 large repositories).</p>
 897 </div>
 898 </div>
 899 </div>
 900 <div class="sect1">
 901 <h2 id="_git">GIT</h2>
 902 <div class="sectionbody">
 903 <div class="paragraph">
 904 <p>Part of the <a href="git.html">git(1)</a> suite</p>
 905 </div>
 906 </div>
 907 </div>
 908 </div>
 909 <div id="footer">
 910 <div id="footer-text">
 911 Last updated 2024-11-01 22:46:55 -0700
 912 </div>
 913 </div>
 914 </body>
 915 </html>