| <!DOCTYPE html> |
| <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
| <head> |
| <meta charset="UTF-8"/> |
| <meta http-equiv="X-UA-Compatible" content="IE=edge"/> |
| <meta name="viewport" content="width=device-width, initial-scale=1.0"/> |
| <meta name="generator" content="Asciidoctor 2.0.23"/> |
| <title>git-merge-tree(1)</title> |
| <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"/> |
| <style> |
| /*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ |
| /* Uncomment the following line when using as a custom stylesheet */ |
| /* @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"; */ |
| html{font-family:sans-serif;-webkit-text-size-adjust:100%} |
| a{background:none} |
| a:focus{outline:thin dotted} |
| a:active,a:hover{outline:0} |
| h1{font-size:2em;margin:.67em 0} |
| b,strong{font-weight:bold} |
| abbr{font-size:.9em} |
| abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none} |
| dfn{font-style:italic} |
| hr{height:0} |
| mark{background:#ff0;color:#000} |
| code,kbd,pre,samp{font-family:monospace;font-size:1em} |
| pre{white-space:pre-wrap} |
| q{quotes:"\201C" "\201D" "\2018" "\2019"} |
| small{font-size:80%} |
| sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline} |
| sup{top:-.5em} |
| sub{bottom:-.25em} |
| img{border:0} |
| svg:not(:root){overflow:hidden} |
| figure{margin:0} |
| audio,video{display:inline-block} |
| audio:not([controls]){display:none;height:0} |
| fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em} |
| legend{border:0;padding:0} |
| button,input,select,textarea{font-family:inherit;font-size:100%;margin:0} |
| button,input{line-height:normal} |
| button,select{text-transform:none} |
| button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer} |
| button[disabled],html input[disabled]{cursor:default} |
| input[type=checkbox],input[type=radio]{padding:0} |
| button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} |
| textarea{overflow:auto;vertical-align:top} |
| table{border-collapse:collapse;border-spacing:0} |
| *,::before,::after{box-sizing:border-box} |
| html,body{font-size:100%} |
| 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} |
| a:hover{cursor:pointer} |
| img,object,embed{max-width:100%;height:auto} |
| object,embed{height:100%} |
| img{-ms-interpolation-mode:bicubic} |
| .left{float:left!important} |
| .right{float:right!important} |
| .text-left{text-align:left!important} |
| .text-right{text-align:right!important} |
| .text-center{text-align:center!important} |
| .text-justify{text-align:justify!important} |
| .hide{display:none} |
| img,object,svg{display:inline-block;vertical-align:middle} |
| textarea{height:auto;min-height:50px} |
| select{width:100%} |
| .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} |
| 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} |
| a{color:#2156a5;text-decoration:underline;line-height:inherit} |
| a:hover,a:focus{color:#1d4b8f} |
| a img{border:0} |
| p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility} |
| p aside{font-size:.875em;line-height:1.35;font-style:italic} |
| 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} |
| 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} |
| h1{font-size:2.125em} |
| h2{font-size:1.6875em} |
| h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em} |
| h4,h5{font-size:1.125em} |
| h6{font-size:1em} |
| hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em} |
| em,i{font-style:italic;line-height:inherit} |
| strong,b{font-weight:bold;line-height:inherit} |
| small{font-size:60%;line-height:inherit} |
| code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)} |
| ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit} |
| ul,ol{margin-left:1.5em} |
| ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0} |
| ul.circle{list-style-type:circle} |
| ul.disc{list-style-type:disc} |
| ul.square{list-style-type:square} |
| ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit} |
| ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0} |
| dl dt{margin-bottom:.3125em;font-weight:bold} |
| dl dd{margin-bottom:1.25em} |
| blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd} |
| blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)} |
| @media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2} |
| h1{font-size:2.75em} |
| h2{font-size:2.3125em} |
| h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em} |
| h4{font-size:1.4375em}} |
| table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal} |
| table thead,table tfoot{background:#f7f8f7} |
| 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} |
| table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)} |
| table tr.even,table tr.alt{background:#f8f8f7} |
| table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6} |
| h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em} |
| h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400} |
| .center{margin-left:auto;margin-right:auto} |
| .stretch{width:100%} |
| .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table} |
| .clearfix::after,.float-group::after{clear:both} |
| :not(pre).nobreak{word-wrap:normal} |
| :not(pre).nowrap{white-space:nowrap} |
| :not(pre).pre-wrap{white-space:pre-wrap} |
| :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} |
| pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed} |
| pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit} |
| pre>code{display:block} |
| pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal} |
| em em{font-style:normal} |
| strong strong{font-weight:400} |
| .keyseq{color:rgba(51,51,51,.8)} |
| 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} |
| .keyseq kbd:first-child{margin-left:0} |
| .keyseq kbd:last-child{margin-right:0} |
| .menuseq,.menuref{color:#000} |
| .menuseq b:not(.caret),.menuref{font-weight:inherit} |
| .menuseq{word-spacing:-.02em} |
| .menuseq b.caret{font-size:1.25em;line-height:.8} |
| .menuseq i.caret{font-weight:bold;text-align:center;width:.45em} |
| b.button::before,b.button::after{position:relative;top:-1px;font-weight:400} |
| b.button::before{content:"[";padding:0 3px 0 2px} |
| b.button::after{content:"]";padding:0 2px 0 3px} |
| p a>code:hover{color:rgba(0,0,0,.9)} |
| #header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em} |
| #header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table} |
| #header::after,#content::after,#footnotes::after,#footer::after{clear:both} |
| #content{margin-top:1.25em} |
| #content::before{content:none} |
| #header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0} |
| #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf} |
| #header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px} |
| #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} |
| #header .details span:first-child{margin-left:-.125em} |
| #header .details span.email a{color:rgba(0,0,0,.85)} |
| #header .details br{display:none} |
| #header .details br+span::before{content:"\00a0\2013\00a0"} |
| #header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)} |
| #header .details br+span#revremark::before{content:"\00a0|\00a0"} |
| #header #revnumber{text-transform:capitalize} |
| #header #revnumber::after{content:"\00a0"} |
| #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} |
| #toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em} |
| #toc>ul{margin-left:.125em} |
| #toc ul.sectlevel0>li>a{font-style:italic} |
| #toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0} |
| #toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none} |
| #toc li{line-height:1.3334;margin-top:.3334em} |
| #toc a{text-decoration:none} |
| #toc a:active{text-decoration:underline} |
| #toctitle{color:#7a2518;font-size:1.2em} |
| @media screen and (min-width:768px){#toctitle{font-size:1.375em} |
| body.toc2{padding-left:15em;padding-right:0} |
| body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px} |
| #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} |
| #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em} |
| #toc.toc2>ul{font-size:.9em;margin-bottom:0} |
| #toc.toc2 ul ul{margin-left:0;padding-left:1em} |
| #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em} |
| body.toc2.toc-right{padding-left:0;padding-right:15em} |
| body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}} |
| @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0} |
| #toc.toc2{width:20em} |
| #toc.toc2 #toctitle{font-size:1.375em} |
| #toc.toc2>ul{font-size:.95em} |
| #toc.toc2 ul ul{padding-left:1.25em} |
| body.toc2.toc-right{padding-left:0;padding-right:20em}} |
| #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px} |
| #content #toc>:first-child{margin-top:0} |
| #content #toc>:last-child{margin-bottom:0} |
| #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em} |
| #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44} |
| #content{margin-bottom:.625em} |
| .sect1{padding-bottom:.625em} |
| @media screen and (min-width:768px){#content{margin-bottom:1.25em} |
| .sect1{padding-bottom:1.25em}} |
| .sect1:last-child{padding-bottom:0} |
| .sect1+.sect1{border-top:1px solid #e7e7e9} |
| #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} |
| #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} |
| #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} |
| #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} |
| #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} |
| details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em} |
| details{margin-left:1.25rem} |
| details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent} |
| details>summary::-webkit-details-marker{display:none} |
| 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%)} |
| details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)} |
| details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem} |
| .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} |
| table.tableblock.fit-content>caption.title{white-space:nowrap;width:0} |
| .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)} |
| .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%} |
| .admonitionblock>table td.icon{text-align:center;width:80px} |
| .admonitionblock>table td.icon img{max-width:none} |
| .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase} |
| .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} |
| .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0} |
| .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px} |
| .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px} |
| .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center} |
| .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0} |
| .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} |
| .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em} |
| @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}} |
| @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}} |
| .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} |
| .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} |
| .listingblock>.content{position:relative} |
| .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} |
| .listingblock:hover code[data-lang]::before{display:block} |
| .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} |
| .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"} |
| .listingblock pre.highlightjs{padding:0} |
| .listingblock pre.highlightjs>code{padding:1em;border-radius:4px} |
| .listingblock pre.prettyprint{border-width:0} |
| .prettyprint{background:#f7f7f8} |
| pre.prettyprint .linenums{line-height:1.45;margin-left:2em} |
| pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0} |
| pre.prettyprint li code[data-lang]::before{opacity:1} |
| pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none} |
| table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none} |
| table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal} |
| table.linenotable td.code{padding-left:.75em} |
| 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} |
| pre.pygments span.linenos{display:inline-block;margin-right:.75em} |
| .quoteblock{margin:0 1em 1.25em 1.5em;display:table} |
| .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em} |
| .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} |
| .quoteblock blockquote{margin:0;padding:0;border:0} |
| .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)} |
| .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0} |
| .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right} |
| .verseblock{margin:0 1em 1.25em} |
| .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} |
| .verseblock pre strong{font-weight:400} |
| .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex} |
| .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic} |
| .quoteblock .attribution br,.verseblock .attribution br{display:none} |
| .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)} |
| .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none} |
| .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} |
| .quoteblock.abstract{margin:0 1em 1.25em;display:block} |
| .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center} |
| .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf} |
| .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0} |
| .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem} |
| .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0} |
| p.tableblock:last-child{margin-bottom:0} |
| td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere} |
| td.tableblock>.content>:last-child{margin-bottom:-1.25em} |
| table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede} |
| table.grid-all>*>tr>*{border-width:1px} |
| table.grid-cols>*>tr>*{border-width:0 1px} |
| table.grid-rows>*>tr>*{border-width:1px 0} |
| table.frame-all{border-width:1px} |
| table.frame-ends{border-width:1px 0} |
| table.frame-sides{border-width:0 1px} |
| table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0} |
| table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0} |
| table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0} |
| table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0} |
| 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} |
| th.halign-left,td.halign-left{text-align:left} |
| th.halign-right,td.halign-right{text-align:right} |
| th.halign-center,td.halign-center{text-align:center} |
| th.valign-top,td.valign-top{vertical-align:top} |
| th.valign-bottom,td.valign-bottom{vertical-align:bottom} |
| th.valign-middle,td.valign-middle{vertical-align:middle} |
| table thead th,table tfoot th{font-weight:bold} |
| tbody tr th{background:#f7f8f7} |
| tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold} |
| p.tableblock>code:only-child{background:none;padding:0} |
| p.tableblock{font-size:1em} |
| ol{margin-left:1.75em} |
| ul li ol{margin-left:1.5em} |
| dl dd{margin-left:1.125em} |
| dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0} |
| li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em} |
| ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none} |
| ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em} |
| ul.unstyled,ol.unstyled{margin-left:0} |
| li>p:empty:only-child::before{content:"";display:inline-block} |
| ul.checklist>li>p:first-child{margin-left:-1em} |
| 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} |
| ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em} |
| ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em} |
| ul.inline>li{margin-left:1.25em} |
| .unstyled dl dt{font-weight:400;font-style:normal} |
| ol.arabic{list-style-type:decimal} |
| ol.decimal{list-style-type:decimal-leading-zero} |
| ol.loweralpha{list-style-type:lower-alpha} |
| ol.upperalpha{list-style-type:upper-alpha} |
| ol.lowerroman{list-style-type:lower-roman} |
| ol.upperroman{list-style-type:upper-roman} |
| ol.lowergreek{list-style-type:lower-greek} |
| .hdlist>table,.colist>table{border:0;background:none} |
| .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none} |
| td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em} |
| td.hdlist1{font-weight:bold;padding-bottom:1.25em} |
| td.hdlist2{word-wrap:anywhere} |
| .literalblock+.colist,.listingblock+.colist{margin-top:-.5em} |
| .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top} |
| .colist td:not([class]):first-child img{max-width:none} |
| .colist td:not([class]):last-child{padding:.25em 0} |
| .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd} |
| .imageblock.left{margin:.25em .625em 1.25em 0} |
| .imageblock.right{margin:.25em 0 1.25em .625em} |
| .imageblock>.title{margin-bottom:0} |
| .imageblock.thumb,.imageblock.th{border-width:6px} |
| .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em} |
| .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0} |
| .image.left{margin-right:.625em} |
| .image.right{margin-left:.625em} |
| a.image{text-decoration:none;display:inline-block} |
| a.image object{pointer-events:none} |
| sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super} |
| sup.footnote a,sup.footnoteref a{text-decoration:none} |
| sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline} |
| #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em} |
| #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0} |
| #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em} |
| #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em} |
| #footnotes .footnote:last-of-type{margin-bottom:0} |
| #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0} |
| div.unbreakable{page-break-inside:avoid} |
| .big{font-size:larger} |
| .small{font-size:smaller} |
| .underline{text-decoration:underline} |
| .overline{text-decoration:overline} |
| .line-through{text-decoration:line-through} |
| .aqua{color:#00bfbf} |
| .aqua-background{background:#00fafa} |
| .black{color:#000} |
| .black-background{background:#000} |
| .blue{color:#0000bf} |
| .blue-background{background:#0000fa} |
| .fuchsia{color:#bf00bf} |
| .fuchsia-background{background:#fa00fa} |
| .gray{color:#606060} |
| .gray-background{background:#7d7d7d} |
| .green{color:#006000} |
| .green-background{background:#007d00} |
| .lime{color:#00bf00} |
| .lime-background{background:#00fa00} |
| .maroon{color:#600000} |
| .maroon-background{background:#7d0000} |
| .navy{color:#000060} |
| .navy-background{background:#00007d} |
| .olive{color:#606000} |
| .olive-background{background:#7d7d00} |
| .purple{color:#600060} |
| .purple-background{background:#7d007d} |
| .red{color:#bf0000} |
| .red-background{background:#fa0000} |
| .silver{color:#909090} |
| .silver-background{background:#bcbcbc} |
| .teal{color:#006060} |
| .teal-background{background:#007d7d} |
| .white{color:#bfbfbf} |
| .white-background{background:#fafafa} |
| .yellow{color:#bfbf00} |
| .yellow-background{background:#fafa00} |
| span.icon>.fa{cursor:default} |
| a span.icon>.fa{cursor:inherit} |
| .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default} |
| .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c} |
| .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111} |
| .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900} |
| .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400} |
| .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000} |
| .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} |
| .conum[data-value] *{color:#fff!important} |
| .conum[data-value]+b{display:none} |
| .conum[data-value]::after{content:attr(data-value)} |
| pre .conum[data-value]{position:relative;top:-.125em} |
| b.conum *{color:inherit!important} |
| .conum:not([data-value]):empty{display:none} |
| dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility} |
| h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em} |
| p strong,td.content strong,div.footnote strong{letter-spacing:-.005em} |
| p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem} |
| p{margin-bottom:1.25rem} |
| .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em} |
| .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc} |
| .print-only{display:none!important} |
| @page{margin:1.25cm .75cm} |
| @media print{*{box-shadow:none!important;text-shadow:none!important} |
| html{font-size:80%} |
| a{color:inherit!important;text-decoration:underline!important} |
| a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important} |
| a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em} |
| abbr[title]{border-bottom:1px dotted} |
| abbr[title]::after{content:" (" attr(title) ")"} |
| pre,blockquote,tr,img,object,svg{page-break-inside:avoid} |
| thead{display:table-header-group} |
| svg{max-width:100%} |
| p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3} |
| h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid} |
| #header,#content,#footnotes,#footer{max-width:none} |
| #toc,.sidebarblock,.exampleblock>.content{background:none!important} |
| #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important} |
| body.book #header{text-align:center} |
| body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em} |
| body.book #header .details{border:0!important;display:block;padding:0!important} |
| body.book #header .details span:first-child{margin-left:0!important} |
| body.book #header .details br{display:block} |
| body.book #header .details br+span::before{content:none!important} |
| body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important} |
| body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always} |
| .listingblock code[data-lang]::before{display:block} |
| #footer{padding:0 .9375em} |
| .hide-on-print{display:none!important} |
| .print-only{display:block!important} |
| .hide-for-print{display:none!important} |
| .show-for-print{display:inherit!important}} |
| @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem} |
| .sect1{padding:0!important} |
| .sect1+.sect1{border:0} |
| #footer{background:none} |
| #footer-text{color:rgba(0,0,0,.6);font-size:.9em}} |
| @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}} |
| </style> |
| <style> |
| pre>code { |
| display: inline; |
| } |
| </style> |
| </head> |
| <body class="manpage"> |
| <div id="header"> |
| <h1>git-merge-tree(1) Manual Page</h1> |
| <h2 id="_name">NAME</h2> |
| <div class="sectionbody"> |
| <p>git-merge-tree - Perform merge without touching index or working tree</p> |
| </div> |
| </div> |
| <div id="content"> |
| <div class="sect1"> |
| <h2 id="_synopsis">SYNOPSIS</h2> |
| <div class="sectionbody"> |
| <div class="verseblock"> |
| <pre class="content"><em>git merge-tree</em> [--write-tree] [<options>] <branch1> <branch2> |
| <em>git merge-tree</em> [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)</pre> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="NEWMERGE">DESCRIPTION</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>This command has a modern <code>--write-tree</code> mode and a deprecated |
| <code>--trivial-merge</code> mode. With the exception of the |
| <a href="#DEPMERGE">DEPRECATED DESCRIPTION</a> section at the end, the rest of |
| this documentation describes the modern <code>--write-tree</code> mode.</p> |
| </div> |
| <div class="paragraph"> |
| <p>Performs a merge, but does not make any new commits and does not read |
| from or write to either the working tree or index.</p> |
| </div> |
| <div class="paragraph"> |
| <p>The performed merge will use the same features as the "real" |
| <a href="git-merge.html">git-merge(1)</a>, including:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>three way content merges of individual files</p> |
| </li> |
| <li> |
| <p>rename detection</p> |
| </li> |
| <li> |
| <p>proper directory/file conflict handling</p> |
| </li> |
| <li> |
| <p>recursive ancestor consolidation (i.e. when there is more than one |
| merge base, creating a virtual merge base by merging the merge bases)</p> |
| </li> |
| <li> |
| <p>etc.</p> |
| </li> |
| </ul> |
| </div> |
| <div class="paragraph"> |
| <p>After the merge completes, a new toplevel tree object is created. See |
| <code>OUTPUT</code> below for details.</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_options">OPTIONS</h2> |
| <div class="sectionbody"> |
| <div class="dlist"> |
| <dl> |
| <dt class="hdlist1">--stdin</dt> |
| <dd> |
| <p>Read the commits to merge from the standard input rather than |
| the command-line. See <a href="#INPUT">INPUT FORMAT</a> below for more |
| information. Implies <code>-z</code>.</p> |
| </dd> |
| <dt class="hdlist1">-z</dt> |
| <dd> |
| <p>Do not quote filenames in the <Conflicted file info> section, |
| and end each filename with a NUL character rather than |
| newline. Also begin the messages section with a NUL character |
| instead of a newline. See <a href="#OUTPUT">OUTPUT</a> below for more |
| information.</p> |
| </dd> |
| <dt class="hdlist1">--name-only</dt> |
| <dd> |
| <p>In the Conflicted file info section, instead of writing a list |
| of (mode, oid, stage, path) tuples to output for conflicted |
| files, just provide a list of filenames with conflicts (and |
| do not list filenames multiple times if they have multiple |
| conflicting stages).</p> |
| </dd> |
| <dt class="hdlist1">--messages</dt> |
| <dt class="hdlist1">--no-messages</dt> |
| <dd> |
| <p>Write any informational messages such as "Auto-merging <path>" |
| or CONFLICT notices to the end of stdout. If unspecified, the |
| default is to include these messages if there are merge |
| conflicts, and to omit them otherwise.</p> |
| </dd> |
| <dt class="hdlist1">--quiet</dt> |
| <dd> |
| <p>Disable all output from the program. Useful when you are only |
| interested in the exit status. Allows merge-tree to exit |
| early when it finds a conflict, and allows it to avoid writing |
| most objects created by merges.</p> |
| </dd> |
| <dt class="hdlist1">--allow-unrelated-histories</dt> |
| <dd> |
| <p>merge-tree will by default error out if the two branches specified |
| share no common history. This flag can be given to override that |
| check and make the merge proceed anyway.</p> |
| </dd> |
| <dt class="hdlist1">--merge-base=<tree-ish></dt> |
| <dd> |
| <p>Instead of finding the merge-bases for <branch1> and <branch2>, |
| specify a merge-base for the merge. This option is incompatible with |
| <code>--stdin</code>.</p> |
| <div class="paragraph"> |
| <p>Specifying multiple bases is currently not supported, which means that when |
| merging two branches with more than one merge-base, using this option may |
| cause merge results to differ from what <code>git</code> <code>merge</code> would compute. This |
| can include potentially losing some changes made on one side of the history |
| in the resulting merge.</p> |
| </div> |
| <div class="paragraph"> |
| <p>With this option, since the merge-base is provided directly, <branch1> and |
| <branch2> do not need to specify commits; trees are enough.</p> |
| </div> |
| </dd> |
| <dt class="hdlist1">-X<option></dt> |
| <dt class="hdlist1">--strategy-option=<option></dt> |
| <dd> |
| <p>Pass the merge strategy-specific option through to the merge strategy. |
| See <a href="git-merge.html">git-merge(1)</a> for details.</p> |
| </dd> |
| </dl> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="OUTPUT">OUTPUT</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>For a successful merge, the output from git-merge-tree is simply one |
| line:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre><OID of toplevel tree></pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>Whereas for a conflicted merge, the output is by default of the form:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre><OID of toplevel tree> |
| <Conflicted file info> |
| <Informational messages></pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>These are discussed individually below.</p> |
| </div> |
| <div class="paragraph"> |
| <p>However, there is an exception. If <code>--stdin</code> is passed, then there is |
| an extra section at the beginning, a NUL character at the end, and then |
| all the sections repeat for each line of input. Thus, if the first merge |
| is conflicted and the second is clean, the output would be of the form:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre><Merge status> |
| <OID of toplevel tree> |
| <Conflicted file info> |
| <Informational messages> |
| NUL |
| <Merge status> |
| <OID of toplevel tree> |
| NUL</pre> |
| </div> |
| </div> |
| <div class="sect2"> |
| <h3 id="MS">Merge status</h3> |
| <div class="paragraph"> |
| <p>This is an integer status followed by a NUL character. The integer status is:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>0: merge had conflicts |
| 1: merge was clean</pre> |
| </div> |
| </div> |
| </div> |
| <div class="sect2"> |
| <h3 id="OIDTLT">OID of toplevel tree</h3> |
| <div class="paragraph"> |
| <p>This is a tree object that represents what would be checked out in the |
| working tree at the end of <code>git</code> <code>merge</code>. If there were conflicts, then |
| files within this tree may have embedded conflict markers. This section |
| is always followed by a newline (or NUL if <code>-z</code> is passed).</p> |
| </div> |
| </div> |
| <div class="sect2"> |
| <h3 id="CFI">Conflicted file info</h3> |
| <div class="paragraph"> |
| <p>This is a sequence of lines with the format</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre><mode> <object> <stage> <filename></pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>The filename will be quoted as explained for the configuration |
| variable <code>core.quotePath</code> (see <a href="git-config.html">git-config(1)</a>). However, if |
| the <code>--name-only</code> option is passed, the mode, object, and stage will |
| be omitted. If <code>-z</code> is passed, the "lines" are terminated by a NUL |
| character instead of a newline character.</p> |
| </div> |
| </div> |
| <div class="sect2"> |
| <h3 id="IM">Informational messages</h3> |
| <div class="paragraph"> |
| <p>This section provides informational messages, typically about |
| conflicts. The format of the section varies significantly depending |
| on whether <code>-z</code> is passed.</p> |
| </div> |
| <div class="paragraph"> |
| <p>If <code>-z</code> is passed:</p> |
| </div> |
| <div class="paragraph"> |
| <p>The output format is zero or more conflict informational records, each |
| of the form:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre><list-of-paths><conflict-type>NUL<conflict-message>NUL</pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>where <list-of-paths> is of the form</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre><number-of-paths>NUL<path1>NUL<path2>NUL...<pathN>NUL</pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>and includes paths (or branch names) affected by the conflict or |
| informational message in <conflict-message>. Also, <conflict-type> is a |
| stable string explaining the type of conflict, such as</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>"Auto-merging"</p> |
| </li> |
| <li> |
| <p>"CONFLICT (rename/delete)"</p> |
| </li> |
| <li> |
| <p>"CONFLICT (submodule lacks merge base)"</p> |
| </li> |
| <li> |
| <p>"CONFLICT (binary)"</p> |
| </li> |
| </ul> |
| </div> |
| <div class="paragraph"> |
| <p>and <conflict-message> is a more detailed message about the conflict which often |
| (but not always) embeds the <stable-short-type-description> within it. These |
| strings may change in future Git versions. Some examples:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>"Auto-merging <file>"</p> |
| </li> |
| <li> |
| <p>"CONFLICT (rename/delete): <oldfile> renamed…​but deleted in…​"</p> |
| </li> |
| <li> |
| <p>"Failed to merge submodule <submodule> (no merge base)"</p> |
| </li> |
| <li> |
| <p>"Warning: cannot merge binary files: <filename>"</p> |
| </li> |
| </ul> |
| </div> |
| <div class="paragraph"> |
| <p>If <code>-z</code> is NOT passed:</p> |
| </div> |
| <div class="paragraph"> |
| <p>This section starts with a blank line to separate it from the previous |
| sections, and then only contains the <conflict-message> information |
| from the previous section (separated by newlines). These are |
| non-stable strings that should not be parsed by scripts, and are just |
| meant for human consumption. Also, note that while <conflict-message> |
| strings usually do not contain embedded newlines, they sometimes do. |
| (However, the free-form messages will never have an embedded NUL |
| character). So, the entire block of information is meant for human |
| readers as an agglomeration of all conflict messages.</p> |
| </div> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_exit_status">EXIT STATUS</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>For a successful, non-conflicted merge, the exit status is 0. When the |
| merge has conflicts, the exit status is 1. If the merge is not able to |
| complete (or start) due to some kind of error, the exit status is |
| something other than 0 or 1 (and the output is unspecified). When |
| --stdin is passed, the return status is 0 for both successful and |
| conflicted merges, and something other than 0 or 1 if it cannot complete |
| all the requested merges.</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_usage_notes">USAGE NOTES</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>This command is intended as low-level plumbing, similar to |
| <a href="git-hash-object.html">git-hash-object(1)</a>, <a href="git-mktree.html">git-mktree(1)</a>, |
| <a href="git-commit-tree.html">git-commit-tree(1)</a>, <a href="git-write-tree.html">git-write-tree(1)</a>, |
| <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 |
| used as a part of a series of steps such as:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>vi message.txt |
| BRANCH1=refs/heads/test |
| BRANCH2=main |
| NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) || { |
| echo "There were conflicts..." 1>&2 |
| exit 1 |
| } |
| NEWCOMMIT=$(git commit-tree $NEWTREE -F message.txt \ |
| -p $BRANCH1 -p $BRANCH2) |
| git update-ref $BRANCH1 $NEWCOMMIT</pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>Note that when the exit status is non-zero, <code>NEWTREE</code> in this sequence |
| will contain a lot more output than just a tree.</p> |
| </div> |
| <div class="paragraph"> |
| <p>For conflicts, the output includes the same information that you’d get |
| with <a href="git-merge.html">git-merge(1)</a>:</p> |
| </div> |
| <div class="ulist"> |
| <ul> |
| <li> |
| <p>what would be written to the working tree (the |
| <a href="#OIDTLT">OID of toplevel tree</a>)</p> |
| </li> |
| <li> |
| <p>the higher order stages that would be written to the index (the |
| <a href="#CFI">Conflicted file info</a>)</p> |
| </li> |
| <li> |
| <p>any messages that would have been printed to stdout (the |
| <a href="#IM">Informational messages</a>)</p> |
| </li> |
| </ul> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="INPUT">INPUT FORMAT</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p><em>git merge-tree --stdin</em> input format is fully text based. Each line |
| has this format:</p> |
| </div> |
| <div class="literalblock"> |
| <div class="content"> |
| <pre>[<base-commit> -- ]<branch1> <branch2></pre> |
| </div> |
| </div> |
| <div class="paragraph"> |
| <p>If one line is separated by <code>--</code>, the string before the separator is |
| used for specifying a merge-base for the merge and the string after |
| the separator describes the branches to be merged.</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_mistakes_to_avoid">MISTAKES TO AVOID</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>Do NOT look through the resulting toplevel tree to try to find which |
| files conflict; parse the <a href="#CFI">Conflicted file info</a> section instead. |
| Not only would parsing an entire tree be horrendously slow in large |
| repositories, there are numerous types of conflicts not representable by |
| conflict markers (modify/delete, mode conflict, binary file changed on |
| both sides, file/directory conflicts, various rename conflict |
| permutations, etc.)</p> |
| </div> |
| <div class="paragraph"> |
| <p>Do NOT interpret an empty <a href="#CFI">Conflicted file info</a> list as a clean |
| merge; check the exit status. A merge can have conflicts without having |
| individual files conflict (there are a few types of directory rename |
| conflicts that fall into this category, and others might also be added |
| in the future).</p> |
| </div> |
| <div class="paragraph"> |
| <p>Do NOT attempt to guess or make the user guess the conflict types from |
| the <a href="#CFI">Conflicted file info</a> list. The information there is |
| insufficient to do so. For example: Rename/rename(1to2) conflicts (both |
| sides renamed the same file differently) will result in three different |
| files having higher order stages (but each only has one higher order |
| stage), with no way (short of the <a href="#IM">Informational messages</a> section) |
| to determine which three files are related. File/directory conflicts |
| also result in a file with exactly one higher order stage. |
| Possibly-involved-in-directory-rename conflicts (when |
| "merge.directoryRenames" is unset or set to "conflicts") also result in |
| a file with exactly one higher order stage. In all cases, the |
| <a href="#IM">Informational messages</a> section has the necessary info, though it |
| is not designed to be machine parseable.</p> |
| </div> |
| <div class="paragraph"> |
| <p>Do NOT assume that each path from <a href="#CFI">Conflicted file info</a>, and |
| the logical conflicts in the <a href="#IM">Informational messages</a> have a |
| one-to-one mapping, nor that there is a one-to-many mapping, nor a |
| many-to-one mapping. Many-to-many mappings exist, meaning that each |
| path can have many logical conflict types in a single merge, and each |
| logical conflict type can affect many paths.</p> |
| </div> |
| <div class="paragraph"> |
| <p>Do NOT assume all filenames listed in the <a href="#IM">Informational messages</a> |
| section had conflicts. Messages can be included for files that have no |
| conflicts, such as "Auto-merging <file>".</p> |
| </div> |
| <div class="paragraph"> |
| <p>AVOID taking the OIDS from the <a href="#CFI">Conflicted file info</a> and |
| re-merging them to present the conflicts to the user. This will lose |
| information. Instead, look up the version of the file found within the |
| <a href="#OIDTLT">OID of toplevel tree</a> and show that instead. In particular, |
| the latter will have conflict markers annotated with the original |
| branch/commit being merged and, if renames were involved, the original |
| filename. While you could include the original branch/commit in the |
| conflict marker annotations when re-merging, the original filename is |
| not available from the <a href="#CFI">Conflicted file info</a> and thus you would |
| be losing information that might help the user resolve the conflict.</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="DEPMERGE">DEPRECATED DESCRIPTION</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>Per the <a href="#NEWMERGE">DESCRIPTION</a> and unlike the rest of this |
| documentation, this section describes the deprecated <code>--trivial-merge</code> |
| mode.</p> |
| </div> |
| <div class="paragraph"> |
| <p>Other than the optional <code>--trivial-merge</code>, this mode accepts no |
| options.</p> |
| </div> |
| <div class="paragraph"> |
| <p>This mode reads three tree-ish, and outputs trivial merge results and |
| conflicting stages to the standard output in a semi-diff format. |
| Since this was designed for higher level scripts to consume and merge |
| the results back into the index, it omits entries that match |
| <branch1>. The result of this second form is similar to what |
| three-way <em>git read-tree -m</em> does, but instead of storing the results |
| in the index, the command outputs the entries to the standard output.</p> |
| </div> |
| <div class="paragraph"> |
| <p>This form not only has limited applicability (a trivial merge cannot |
| handle content merges of individual files, rename detection, proper |
| directory/file conflict handling, etc.), the output format is also |
| difficult to work with, and it will generally be less performant than |
| the first form even on successful merges (especially if working in |
| large repositories).</p> |
| </div> |
| </div> |
| </div> |
| <div class="sect1"> |
| <h2 id="_git">GIT</h2> |
| <div class="sectionbody"> |
| <div class="paragraph"> |
| <p>Part of the <a href="git.html">git(1)</a> suite</p> |
| </div> |
| </div> |
| </div> |
| </div> |
| <div id="footer"> |
| <div id="footer-text"> |
| Last updated 2025-10-10 14:32:39 -0700 |
| </div> |
| </div> |
| </body> |
| </html> |
