| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 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"/> |
| Junio C Hamano | d6a33e4 | 2025-02-18 23:45:11 | [diff] [blame] | 7 | <meta name="generator" content="Asciidoctor 2.0.23"/> |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 8 | <title>git-merge-file(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} |
| Junio C Hamano | d6a33e4 | 2025-02-18 23:45:11 | [diff] [blame] | 143 | #header>h1:only-child{border-bottom:1px solid #dddddf;padding-bottom:8px} |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 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} |
| Junio C Hamano | d6a33e4 | 2025-02-18 23:45:11 | [diff] [blame] | 165 | body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px} |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 166 | #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} |
| 167 | #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em} |
| 168 | #toc.toc2>ul{font-size:.9em;margin-bottom:0} |
| 169 | #toc.toc2 ul ul{margin-left:0;padding-left:1em} |
| 170 | #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em} |
| 171 | body.toc2.toc-right{padding-left:0;padding-right:15em} |
| 172 | body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}} |
| 173 | @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0} |
| 174 | #toc.toc2{width:20em} |
| 175 | #toc.toc2 #toctitle{font-size:1.375em} |
| 176 | #toc.toc2>ul{font-size:.95em} |
| 177 | #toc.toc2 ul ul{padding-left:1.25em} |
| 178 | body.toc2.toc-right{padding-left:0;padding-right:20em}} |
| 179 | #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px} |
| 180 | #content #toc>:first-child{margin-top:0} |
| 181 | #content #toc>:last-child{margin-bottom:0} |
| 182 | #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em} |
| 183 | #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44} |
| 184 | #content{margin-bottom:.625em} |
| 185 | .sect1{padding-bottom:.625em} |
| 186 | @media screen and (min-width:768px){#content{margin-bottom:1.25em} |
| 187 | .sect1{padding-bottom:1.25em}} |
| 188 | .sect1:last-child{padding-bottom:0} |
| 189 | .sect1+.sect1{border-top:1px solid #e7e7e9} |
| 190 | #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} |
| 191 | #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} |
| 192 | #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} |
| 193 | #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} |
| 194 | #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} |
| 195 | details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em} |
| 196 | details{margin-left:1.25rem} |
| 197 | details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent} |
| 198 | details>summary::-webkit-details-marker{display:none} |
| 199 | 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%)} |
| 200 | details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)} |
| 201 | details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem} |
| 202 | .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} |
| 203 | table.tableblock.fit-content>caption.title{white-space:nowrap;width:0} |
| 204 | .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)} |
| 205 | .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%} |
| 206 | .admonitionblock>table td.icon{text-align:center;width:80px} |
| 207 | .admonitionblock>table td.icon img{max-width:none} |
| 208 | .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase} |
| 209 | .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} |
| 210 | .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0} |
| 211 | .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px} |
| 212 | .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px} |
| 213 | .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center} |
| 214 | .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0} |
| 215 | .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} |
| 216 | .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em} |
| 217 | @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}} |
| 218 | @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}} |
| 219 | .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8} |
| 220 | .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)} |
| 221 | .listingblock>.content{position:relative} |
| 222 | .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} |
| 223 | .listingblock:hover code[data-lang]::before{display:block} |
| 224 | .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5} |
| 225 | .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"} |
| 226 | .listingblock pre.highlightjs{padding:0} |
| 227 | .listingblock pre.highlightjs>code{padding:1em;border-radius:4px} |
| 228 | .listingblock pre.prettyprint{border-width:0} |
| 229 | .prettyprint{background:#f7f7f8} |
| 230 | pre.prettyprint .linenums{line-height:1.45;margin-left:2em} |
| 231 | pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0} |
| 232 | pre.prettyprint li code[data-lang]::before{opacity:1} |
| 233 | pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none} |
| 234 | table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none} |
| 235 | table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal} |
| 236 | table.linenotable td.code{padding-left:.75em} |
| 237 | 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} |
| 238 | pre.pygments span.linenos{display:inline-block;margin-right:.75em} |
| 239 | .quoteblock{margin:0 1em 1.25em 1.5em;display:table} |
| 240 | .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em} |
| 241 | .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} |
| 242 | .quoteblock blockquote{margin:0;padding:0;border:0} |
| 243 | .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)} |
| 244 | .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0} |
| 245 | .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right} |
| 246 | .verseblock{margin:0 1em 1.25em} |
| 247 | .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} |
| 248 | .verseblock pre strong{font-weight:400} |
| 249 | .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex} |
| 250 | .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic} |
| 251 | .quoteblock .attribution br,.verseblock .attribution br{display:none} |
| 252 | .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)} |
| 253 | .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none} |
| 254 | .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} |
| 255 | .quoteblock.abstract{margin:0 1em 1.25em;display:block} |
| 256 | .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center} |
| 257 | .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf} |
| 258 | .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0} |
| 259 | .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem} |
| 260 | .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0} |
| 261 | p.tableblock:last-child{margin-bottom:0} |
| 262 | td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere} |
| 263 | td.tableblock>.content>:last-child{margin-bottom:-1.25em} |
| 264 | table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede} |
| 265 | table.grid-all>*>tr>*{border-width:1px} |
| 266 | table.grid-cols>*>tr>*{border-width:0 1px} |
| 267 | table.grid-rows>*>tr>*{border-width:1px 0} |
| 268 | table.frame-all{border-width:1px} |
| 269 | table.frame-ends{border-width:1px 0} |
| 270 | table.frame-sides{border-width:0 1px} |
| 271 | table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0} |
| 272 | table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0} |
| 273 | table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0} |
| 274 | table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0} |
| 275 | 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} |
| 276 | th.halign-left,td.halign-left{text-align:left} |
| 277 | th.halign-right,td.halign-right{text-align:right} |
| 278 | th.halign-center,td.halign-center{text-align:center} |
| 279 | th.valign-top,td.valign-top{vertical-align:top} |
| 280 | th.valign-bottom,td.valign-bottom{vertical-align:bottom} |
| 281 | th.valign-middle,td.valign-middle{vertical-align:middle} |
| 282 | table thead th,table tfoot th{font-weight:bold} |
| 283 | tbody tr th{background:#f7f8f7} |
| 284 | tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold} |
| 285 | p.tableblock>code:only-child{background:none;padding:0} |
| 286 | p.tableblock{font-size:1em} |
| 287 | ol{margin-left:1.75em} |
| 288 | ul li ol{margin-left:1.5em} |
| 289 | dl dd{margin-left:1.125em} |
| 290 | dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0} |
| 291 | li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em} |
| 292 | ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none} |
| 293 | ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em} |
| 294 | ul.unstyled,ol.unstyled{margin-left:0} |
| 295 | li>p:empty:only-child::before{content:"";display:inline-block} |
| 296 | ul.checklist>li>p:first-child{margin-left:-1em} |
| 297 | 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} |
| 298 | ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em} |
| 299 | ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em} |
| 300 | ul.inline>li{margin-left:1.25em} |
| 301 | .unstyled dl dt{font-weight:400;font-style:normal} |
| 302 | ol.arabic{list-style-type:decimal} |
| 303 | ol.decimal{list-style-type:decimal-leading-zero} |
| 304 | ol.loweralpha{list-style-type:lower-alpha} |
| 305 | ol.upperalpha{list-style-type:upper-alpha} |
| 306 | ol.lowerroman{list-style-type:lower-roman} |
| 307 | ol.upperroman{list-style-type:upper-roman} |
| 308 | ol.lowergreek{list-style-type:lower-greek} |
| 309 | .hdlist>table,.colist>table{border:0;background:none} |
| 310 | .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none} |
| 311 | td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em} |
| 312 | td.hdlist1{font-weight:bold;padding-bottom:1.25em} |
| 313 | td.hdlist2{word-wrap:anywhere} |
| 314 | .literalblock+.colist,.listingblock+.colist{margin-top:-.5em} |
| 315 | .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top} |
| 316 | .colist td:not([class]):first-child img{max-width:none} |
| 317 | .colist td:not([class]):last-child{padding:.25em 0} |
| 318 | .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd} |
| 319 | .imageblock.left{margin:.25em .625em 1.25em 0} |
| 320 | .imageblock.right{margin:.25em 0 1.25em .625em} |
| 321 | .imageblock>.title{margin-bottom:0} |
| 322 | .imageblock.thumb,.imageblock.th{border-width:6px} |
| 323 | .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em} |
| 324 | .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0} |
| 325 | .image.left{margin-right:.625em} |
| 326 | .image.right{margin-left:.625em} |
| 327 | a.image{text-decoration:none;display:inline-block} |
| 328 | a.image object{pointer-events:none} |
| 329 | sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super} |
| 330 | sup.footnote a,sup.footnoteref a{text-decoration:none} |
| Junio C Hamano | d6a33e4 | 2025-02-18 23:45:11 | [diff] [blame] | 331 | sup.footnote a:active,sup.footnoteref a:active,#footnotes .footnote a:first-of-type:active{text-decoration:underline} |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 332 | #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em} |
| 333 | #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0} |
| 334 | #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em} |
| 335 | #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em} |
| 336 | #footnotes .footnote:last-of-type{margin-bottom:0} |
| 337 | #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0} |
| 338 | div.unbreakable{page-break-inside:avoid} |
| 339 | .big{font-size:larger} |
| 340 | .small{font-size:smaller} |
| 341 | .underline{text-decoration:underline} |
| 342 | .overline{text-decoration:overline} |
| 343 | .line-through{text-decoration:line-through} |
| 344 | .aqua{color:#00bfbf} |
| 345 | .aqua-background{background:#00fafa} |
| 346 | .black{color:#000} |
| 347 | .black-background{background:#000} |
| 348 | .blue{color:#0000bf} |
| 349 | .blue-background{background:#0000fa} |
| 350 | .fuchsia{color:#bf00bf} |
| 351 | .fuchsia-background{background:#fa00fa} |
| 352 | .gray{color:#606060} |
| 353 | .gray-background{background:#7d7d7d} |
| 354 | .green{color:#006000} |
| 355 | .green-background{background:#007d00} |
| 356 | .lime{color:#00bf00} |
| 357 | .lime-background{background:#00fa00} |
| 358 | .maroon{color:#600000} |
| 359 | .maroon-background{background:#7d0000} |
| 360 | .navy{color:#000060} |
| 361 | .navy-background{background:#00007d} |
| 362 | .olive{color:#606000} |
| 363 | .olive-background{background:#7d7d00} |
| 364 | .purple{color:#600060} |
| 365 | .purple-background{background:#7d007d} |
| 366 | .red{color:#bf0000} |
| 367 | .red-background{background:#fa0000} |
| 368 | .silver{color:#909090} |
| 369 | .silver-background{background:#bcbcbc} |
| 370 | .teal{color:#006060} |
| 371 | .teal-background{background:#007d7d} |
| 372 | .white{color:#bfbfbf} |
| 373 | .white-background{background:#fafafa} |
| 374 | .yellow{color:#bfbf00} |
| 375 | .yellow-background{background:#fafa00} |
| 376 | span.icon>.fa{cursor:default} |
| 377 | a span.icon>.fa{cursor:inherit} |
| 378 | .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default} |
| 379 | .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c} |
| 380 | .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111} |
| 381 | .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900} |
| 382 | .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400} |
| 383 | .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000} |
| 384 | .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} |
| 385 | .conum[data-value] *{color:#fff!important} |
| 386 | .conum[data-value]+b{display:none} |
| 387 | .conum[data-value]::after{content:attr(data-value)} |
| 388 | pre .conum[data-value]{position:relative;top:-.125em} |
| 389 | b.conum *{color:inherit!important} |
| 390 | .conum:not([data-value]):empty{display:none} |
| 391 | dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility} |
| 392 | h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em} |
| 393 | p strong,td.content strong,div.footnote strong{letter-spacing:-.005em} |
| 394 | p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem} |
| 395 | p{margin-bottom:1.25rem} |
| 396 | .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em} |
| 397 | .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc} |
| 398 | .print-only{display:none!important} |
| 399 | @page{margin:1.25cm .75cm} |
| 400 | @media print{*{box-shadow:none!important;text-shadow:none!important} |
| 401 | html{font-size:80%} |
| 402 | a{color:inherit!important;text-decoration:underline!important} |
| 403 | a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important} |
| 404 | a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em} |
| 405 | abbr[title]{border-bottom:1px dotted} |
| 406 | abbr[title]::after{content:" (" attr(title) ")"} |
| 407 | pre,blockquote,tr,img,object,svg{page-break-inside:avoid} |
| 408 | thead{display:table-header-group} |
| 409 | svg{max-width:100%} |
| 410 | p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3} |
| 411 | h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid} |
| 412 | #header,#content,#footnotes,#footer{max-width:none} |
| 413 | #toc,.sidebarblock,.exampleblock>.content{background:none!important} |
| 414 | #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important} |
| 415 | body.book #header{text-align:center} |
| 416 | body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em} |
| 417 | body.book #header .details{border:0!important;display:block;padding:0!important} |
| 418 | body.book #header .details span:first-child{margin-left:0!important} |
| 419 | body.book #header .details br{display:block} |
| 420 | body.book #header .details br+span::before{content:none!important} |
| 421 | body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important} |
| 422 | body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always} |
| 423 | .listingblock code[data-lang]::before{display:block} |
| 424 | #footer{padding:0 .9375em} |
| 425 | .hide-on-print{display:none!important} |
| 426 | .print-only{display:block!important} |
| 427 | .hide-for-print{display:none!important} |
| 428 | .show-for-print{display:inherit!important}} |
| 429 | @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem} |
| 430 | .sect1{padding:0!important} |
| 431 | .sect1+.sect1{border:0} |
| 432 | #footer{background:none} |
| 433 | #footer-text{color:rgba(0,0,0,.6);font-size:.9em}} |
| 434 | @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}} |
| 435 | </style> |
| 436 | <style> |
| 437 | pre>code { |
| 438 | display: inline; |
| 439 | } |
| 440 | </style> |
| 441 | </head> |
| 442 | <body class="manpage"> |
| 443 | <div id="header"> |
| 444 | <h1>git-merge-file(1) Manual Page</h1> |
| 445 | <h2 id="_name">NAME</h2> |
| 446 | <div class="sectionbody"> |
| 447 | <p>git-merge-file - Run a three-way file merge</p> |
| 448 | </div> |
| 449 | </div> |
| 450 | <div id="content"> |
| 451 | <div class="sect1"> |
| 452 | <h2 id="_synopsis">SYNOPSIS</h2> |
| 453 | <div class="sectionbody"> |
| 454 | <div class="verseblock"> |
| 455 | <pre class="content"><em>git merge-file</em> [-L <current-name> [-L <base-name> [-L <other-name>]]] |
| 456 | [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] |
| 457 | [--[no-]diff3] [--object-id] <current> <base> <other></pre> |
| 458 | </div> |
| 459 | </div> |
| 460 | </div> |
| 461 | <div class="sect1"> |
| 462 | <h2 id="_description">DESCRIPTION</h2> |
| 463 | <div class="sectionbody"> |
| 464 | <div class="paragraph"> |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 465 | <p>Given three files <em><current></em>, <em><base></em> and <em><other></em>, |
| 466 | <em>git merge-file</em> incorporates all changes that lead from <em><base></em> |
| 467 | to <em><other></em> into <em><current></em>. The result ordinarily goes into |
| 468 | <em><current></em>. <em>git merge-file</em> is useful for combining separate changes |
| 469 | to an original. Suppose <em><base></em> is the original, and both |
| 470 | <em><current></em> and <em><other></em> are modifications of <em><base></em>, |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 471 | then <em>git merge-file</em> combines both changes.</p> |
| 472 | </div> |
| 473 | <div class="paragraph"> |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 474 | <p>A conflict occurs if both <em><current></em> and <em><other></em> have changes |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 475 | in a common segment of lines. If a conflict is found, <em>git merge-file</em> |
| 476 | normally outputs a warning and brackets the conflict with lines containing |
| 477 | <<<<<<< and >>>>>>> markers. A typical conflict will look like this:</p> |
| 478 | </div> |
| 479 | <div class="literalblock"> |
| 480 | <div class="content"> |
| 481 | <pre><<<<<<< A |
| 482 | lines in file A |
| 483 | ======= |
| 484 | lines in file B |
| 485 | >>>>>>> B</pre> |
| 486 | </div> |
| 487 | </div> |
| 488 | <div class="paragraph"> |
| 489 | <p>If there are conflicts, the user should edit the result and delete one of |
| 490 | the alternatives. When <code>--ours</code>, <code>--theirs</code>, or <code>--union</code> option is in effect, |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 491 | however, these conflicts are resolved favouring lines from <em><current></em>, |
| 492 | lines from <em><other></em>, or lines from both respectively. The length of the |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 493 | conflict markers can be given with the <code>--marker-size</code> option.</p> |
| 494 | </div> |
| 495 | <div class="paragraph"> |
| 496 | <p>If <code>--object-id</code> is specified, exactly the same behavior occurs, except that |
| 497 | instead of specifying what to merge as files, it is specified as a list of |
| 498 | object IDs referring to blobs.</p> |
| 499 | </div> |
| 500 | <div class="paragraph"> |
| 501 | <p>The exit value of this program is negative on error, and the number of |
| 502 | conflicts otherwise (truncated to 127 if there are more than that many |
| 503 | conflicts). If the merge was clean, the exit value is 0.</p> |
| 504 | </div> |
| 505 | <div class="paragraph"> |
| 506 | <p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it |
| 507 | implements all of RCS <em>merge</em>'s functionality which is needed by |
| 508 | <a href="git.html">git(1)</a>.</p> |
| 509 | </div> |
| 510 | </div> |
| 511 | </div> |
| 512 | <div class="sect1"> |
| 513 | <h2 id="_options">OPTIONS</h2> |
| 514 | <div class="sectionbody"> |
| 515 | <div class="dlist"> |
| 516 | <dl> |
| 517 | <dt class="hdlist1">--object-id</dt> |
| 518 | <dd> |
| 519 | <p>Specify the contents to merge as blobs in the current repository instead of |
| 520 | files. In this case, the operation must take place within a valid repository.</p> |
| 521 | <div class="paragraph"> |
| 522 | <p>If the <code>-p</code> option is specified, the merged file (including conflicts, if any) |
| 523 | goes to standard output as normal; otherwise, the merged file is written to the |
| 524 | object store and the object ID of its blob is written to standard output.</p> |
| 525 | </div> |
| 526 | </dd> |
| 527 | <dt class="hdlist1">-L <label></dt> |
| 528 | <dd> |
| 529 | <p>This option may be given up to three times, and |
| 530 | specifies labels to be used in place of the |
| 531 | corresponding file names in conflict reports. That is, |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 532 | <code>git</code> <code>merge-file</code> <code>-L</code> <code>x</code> <code>-L</code> <code>y</code> <code>-L</code> <code>z</code> <code>a</code> <code>b</code> <code>c</code> generates output that |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 533 | looks like it came from files x, y and z instead of |
| 534 | from files a, b and c.</p> |
| 535 | </dd> |
| 536 | <dt class="hdlist1">-p</dt> |
| 537 | <dd> |
| 538 | <p>Send results to standard output instead of overwriting |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 539 | <em><current></em>.</p> |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 540 | </dd> |
| 541 | <dt class="hdlist1">-q</dt> |
| 542 | <dd> |
| 543 | <p>Quiet; do not warn about conflicts.</p> |
| 544 | </dd> |
| 545 | <dt class="hdlist1">--diff3</dt> |
| 546 | <dd> |
| 547 | <p>Show conflicts in "diff3" style.</p> |
| 548 | </dd> |
| 549 | <dt class="hdlist1">--zdiff3</dt> |
| 550 | <dd> |
| 551 | <p>Show conflicts in "zdiff3" style.</p> |
| 552 | </dd> |
| 553 | <dt class="hdlist1">--ours</dt> |
| 554 | <dt class="hdlist1">--theirs</dt> |
| 555 | <dt class="hdlist1">--union</dt> |
| 556 | <dd> |
| 557 | <p>Instead of leaving conflicts in the file, resolve conflicts |
| 558 | favouring our (or their or both) side of the lines.</p> |
| 559 | </dd> |
| 560 | <dt class="hdlist1">--diff-algorithm={patience|minimal|histogram|myers}</dt> |
| 561 | <dd> |
| 562 | <p>Use a different diff algorithm while merging. The current default is "myers", |
| 563 | but selecting more recent algorithm such as "histogram" can help |
| 564 | avoid mismerges that occur due to unimportant matching lines |
| 565 | (such as braces from distinct functions). See also |
| 566 | <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>.</p> |
| 567 | </dd> |
| 568 | </dl> |
| 569 | </div> |
| 570 | </div> |
| 571 | </div> |
| 572 | <div class="sect1"> |
| 573 | <h2 id="_examples">EXAMPLES</h2> |
| 574 | <div class="sectionbody"> |
| 575 | <div class="dlist"> |
| 576 | <dl> |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 577 | <dt class="hdlist1"><code>git</code> <code>merge-file</code> <code>README.my</code> <code>README</code> <code>README.upstream</code></dt> |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 578 | <dd> |
| 579 | <p>combines the changes of README.my and README.upstream since README, |
| 580 | tries to merge them and writes the result into README.my.</p> |
| 581 | </dd> |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 582 | <dt class="hdlist1"><code>git</code> <code>merge-file</code> <code>-L</code> <code>a</code> <code>-L</code> <code>b</code> <code>-L</code> <code>c</code> <code>tmp/a123</code> <code>tmp/b234</code> <code>tmp/c345</code></dt> |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 583 | <dd> |
| 584 | <p>merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels |
| 585 | <code>a</code> and <code>c</code> instead of <code>tmp/a123</code> and <code>tmp/c345</code>.</p> |
| 586 | </dd> |
| Junio C Hamano | dc39238 | 2024-10-11 18:57:29 | [diff] [blame] | 587 | <dt class="hdlist1"><code>git</code> <code>merge-file</code> <code>-p</code> <code>--object-id</code> <code>abc1234</code> <code>def567</code> <code>890abcd</code></dt> |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 588 | <dd> |
| 589 | <p>combines the changes of the blob abc1234 and 890abcd since def567, |
| 590 | tries to merge them and writes the result to standard output</p> |
| 591 | </dd> |
| 592 | </dl> |
| 593 | </div> |
| 594 | </div> |
| 595 | </div> |
| 596 | <div class="sect1"> |
| 597 | <h2 id="_git">GIT</h2> |
| 598 | <div class="sectionbody"> |
| 599 | <div class="paragraph"> |
| 600 | <p>Part of the <a href="git.html">git(1)</a> suite</p> |
| 601 | </div> |
| 602 | </div> |
| 603 | </div> |
| 604 | </div> |
| 605 | <div id="footer"> |
| 606 | <div id="footer-text"> |
| Junio C Hamano | 1cc68cc | 2025-08-04 16:37:24 | [diff] [blame] | 607 | Last updated 2025-06-20 18:10:42 -0700 |
| Junio C Hamano | b96f40a | 2024-08-01 00:57:25 | [diff] [blame] | 608 | </div> |
| 609 | </div> |
| 610 | </body> |
| 611 | </html> |
