git-merge-file.html

   1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   2     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   4 <head>
   5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   6 <meta name="generator" content="AsciiDoc 8.2.5" />
   7 <style type="text/css">
   8 /* Debug borders */
   9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  10 /*
  11   border: 1px solid red;
  12 */
  13 }
  14
  15 body {
  16   margin: 1em 5% 1em 5%;
  17 }
  18
  19 a {
  20   color: blue;
  21   text-decoration: underline;
  22 }
  23 a:visited {
  24   color: fuchsia;
  25 }
  26
  27 em {
  28   font-style: italic;
  29 }
  30
  31 strong {
  32   font-weight: bold;
  33 }
  34
  35 tt {
  36   color: navy;
  37 }
  38
  39 h1, h2, h3, h4, h5, h6 {
  40   color: #527bbd;
  41   font-family: sans-serif;
  42   margin-top: 1.2em;
  43   margin-bottom: 0.5em;
  44   line-height: 1.3;
  45 }
  46
  47 h1, h2, h3 {
  48   border-bottom: 2px solid silver;
  49 }
  50 h2 {
  51   padding-top: 0.5em;
  52 }
  53 h3 {
  54   float: left;
  55 }
  56 h3 + * {
  57   clear: left;
  58 }
  59
  60 div.sectionbody {
  61   font-family: serif;
  62   margin-left: 0;
  63 }
  64
  65 hr {
  66   border: 1px solid silver;
  67 }
  68
  69 p {
  70   margin-top: 0.5em;
  71   margin-bottom: 0.5em;
  72 }
  73
  74 pre {
  75   padding: 0;
  76   margin: 0;
  77 }
  78
  79 span#author {
  80   color: #527bbd;
  81   font-family: sans-serif;
  82   font-weight: bold;
  83   font-size: 1.1em;
  84 }
  85 span#email {
  86 }
  87 span#revision {
  88   font-family: sans-serif;
  89 }
  90
  91 div#footer {
  92   font-family: sans-serif;
  93   font-size: small;
  94   border-top: 2px solid silver;
  95   padding-top: 0.5em;
  96   margin-top: 4.0em;
  97 }
  98 div#footer-text {
  99   float: left;
 100   padding-bottom: 0.5em;
 101 }
 102 div#footer-badges {
 103   float: right;
 104   padding-bottom: 0.5em;
 105 }
 106
 107 div#preamble,
 108 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 109 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 110 div.admonitionblock {
 111   margin-right: 10%;
 112   margin-top: 1.5em;
 113   margin-bottom: 1.5em;
 114 }
 115 div.admonitionblock {
 116   margin-top: 2.5em;
 117   margin-bottom: 2.5em;
 118 }
 119
 120 div.content { /* Block element content. */
 121   padding: 0;
 122 }
 123
 124 /* Block element titles. */
 125 div.title, caption.title {
 126   font-family: sans-serif;
 127   font-weight: bold;
 128   text-align: left;
 129   margin-top: 1.0em;
 130   margin-bottom: 0.5em;
 131 }
 132 div.title + * {
 133   margin-top: 0;
 134 }
 135
 136 td div.title:first-child {
 137   margin-top: 0.0em;
 138 }
 139 div.content div.title:first-child {
 140   margin-top: 0.0em;
 141 }
 142 div.content + div.title {
 143   margin-top: 0.0em;
 144 }
 145
 146 div.sidebarblock > div.content {
 147   background: #ffffee;
 148   border: 1px solid silver;
 149   padding: 0.5em;
 150 }
 151
 152 div.listingblock {
 153   margin-right: 0%;
 154 }
 155 div.listingblock > div.content {
 156   border: 1px solid silver;
 157   background: #f4f4f4;
 158   padding: 0.5em;
 159 }
 160
 161 div.quoteblock > div.content {
 162   padding-left: 2.0em;
 163 }
 164
 165 div.attribution {
 166   text-align: right;
 167 }
 168 div.verseblock + div.attribution {
 169   text-align: left;
 170 }
 171
 172 div.admonitionblock .icon {
 173   vertical-align: top;
 174   font-size: 1.1em;
 175   font-weight: bold;
 176   text-decoration: underline;
 177   color: #527bbd;
 178   padding-right: 0.5em;
 179 }
 180 div.admonitionblock td.content {
 181   padding-left: 0.5em;
 182   border-left: 2px solid silver;
 183 }
 184
 185 div.exampleblock > div.content {
 186   border-left: 2px solid silver;
 187   padding: 0.5em;
 188 }
 189
 190 div.verseblock div.content {
 191   white-space: pre;
 192 }
 193
 194 div.imageblock div.content { padding-left: 0; }
 195 div.imageblock img { border: 1px solid silver; }
 196 span.image img { border-style: none; }
 197
 198 dl {
 199   margin-top: 0.8em;
 200   margin-bottom: 0.8em;
 201 }
 202 dt {
 203   margin-top: 0.5em;
 204   margin-bottom: 0;
 205   font-style: italic;
 206 }
 207 dd > *:first-child {
 208   margin-top: 0;
 209 }
 210
 211 ul, ol {
 212     list-style-position: outside;
 213 }
 214 div.olist2 ol {
 215   list-style-type: lower-alpha;
 216 }
 217
 218 div.tableblock > table {
 219   border: 3px solid #527bbd;
 220 }
 221 thead {
 222   font-family: sans-serif;
 223   font-weight: bold;
 224 }
 225 tfoot {
 226   font-weight: bold;
 227 }
 228
 229 div.hlist {
 230   margin-top: 0.8em;
 231   margin-bottom: 0.8em;
 232 }
 233 div.hlist td {
 234   padding-bottom: 5px;
 235 }
 236 td.hlist1 {
 237   vertical-align: top;
 238   font-style: italic;
 239   padding-right: 0.8em;
 240 }
 241 td.hlist2 {
 242   vertical-align: top;
 243 }
 244
 245 @media print {
 246   div#footer-badges { display: none; }
 247 }
 248
 249 div#toctitle {
 250   color: #527bbd;
 251   font-family: sans-serif;
 252   font-size: 1.1em;
 253   font-weight: bold;
 254   margin-top: 1.0em;
 255   margin-bottom: 0.1em;
 256 }
 257
 258 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 259   margin-top: 0;
 260   margin-bottom: 0;
 261 }
 262 div.toclevel2 {
 263   margin-left: 2em;
 264   font-size: 0.9em;
 265 }
 266 div.toclevel3 {
 267   margin-left: 4em;
 268   font-size: 0.9em;
 269 }
 270 div.toclevel4 {
 271   margin-left: 6em;
 272   font-size: 0.9em;
 273 }
 274 include1::./stylesheets/xhtml11-manpage.css[]
 275 /* Workarounds for IE6's broken and incomplete CSS2. */
 276
 277 div.sidebar-content {
 278   background: #ffffee;
 279   border: 1px solid silver;
 280   padding: 0.5em;
 281 }
 282 div.sidebar-title, div.image-title {
 283   font-family: sans-serif;
 284   font-weight: bold;
 285   margin-top: 0.0em;
 286   margin-bottom: 0.5em;
 287 }
 288
 289 div.listingblock div.content {
 290   border: 1px solid silver;
 291   background: #f4f4f4;
 292   padding: 0.5em;
 293 }
 294
 295 div.quoteblock-content {
 296   padding-left: 2.0em;
 297 }
 298
 299 div.exampleblock-content {
 300   border-left: 2px solid silver;
 301   padding-left: 0.5em;
 302 }
 303
 304 /* IE6 sets dynamically generated links as visited. */
 305 div#toc a:visited { color: blue; }
 306 </style>
 307 <title>git-merge-file(1)</title>
 308 </head>
 309 <body>
 310 <div id="header">
 311 <h1>
 312 git-merge-file(1) Manual Page
 313 </h1>
 314 <h2>NAME</h2>
 315 <div class="sectionbody">
 316 <p>git-merge-file -
 317    Run a three-way file merge
 318 </p>
 319 </div>
 320 </div>
 321 <h2>SYNOPSIS</h2>
 322 <div class="sectionbody">
 323 <div class="verseblock">
 324 <div class="content"><em>git merge-file</em> [-L &lt;current-name&gt; [-L &lt;base-name&gt; [-L &lt;other-name&gt;]]]
 325         [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=&lt;n&gt;]
 326         &lt;current-file&gt; &lt;base-file&gt; &lt;other-file&gt;</div></div>
 327 </div>
 328 <h2 id="_description">DESCRIPTION</h2>
 329 <div class="sectionbody">
 330 <div class="para"><p><em>git merge-file</em> incorporates all changes that lead from the <tt>&lt;base-file&gt;</tt>
 331 to <tt>&lt;other-file&gt;</tt> into <tt>&lt;current-file&gt;</tt>. The result ordinarily goes into
 332 <tt>&lt;current-file&gt;</tt>. <em>git merge-file</em> is useful for combining separate changes
 333 to an original. Suppose <tt>&lt;base-file&gt;</tt> is the original, and both
 334 <tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> are modifications of <tt>&lt;base-file&gt;</tt>,
 335 then <em>git merge-file</em> combines both changes.</p></div>
 336 <div class="para"><p>A conflict occurs if both <tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> have changes
 337 in a common segment of lines. If a conflict is found, <em>git merge-file</em>
 338 normally outputs a warning and brackets the conflict with lines containing
 339 &lt;&lt;&lt;&lt;&lt;&lt;&lt; and &gt;&gt;&gt;&gt;&gt;&gt;&gt; markers. A typical conflict will look like this:</p></div>
 340 <div class="literalblock">
 341 <div class="content">
 342 <pre><tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt; A
 343 lines in file A
 344 =======
 345 lines in file B
 346 &gt;&gt;&gt;&gt;&gt;&gt;&gt; B</tt></pre>
 347 </div></div>
 348 <div class="para"><p>If there are conflicts, the user should edit the result and delete one of
 349 the alternatives.  When <tt>--ours</tt>, <tt>--theirs</tt>, or <tt>--union</tt> option is in effect,
 350 however, these conflicts are resolved favouring lines from <tt>&lt;current-file&gt;</tt>,
 351 lines from <tt>&lt;other-file&gt;</tt>, or lines from both respectively.  The length of the
 352 conflict markers can be given with the <tt>--marker-size</tt> option.</p></div>
 353 <div class="para"><p>The exit value of this program is negative on error, and the number of
 354 conflicts otherwise. If the merge was clean, the exit value is 0.</p></div>
 355 <div class="para"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it
 356 implements all of RCS <em>merge</em>'s functionality which is needed by
 357 <a href="git.html">git(1)</a>.</p></div>
 358 </div>
 359 <h2 id="_options">OPTIONS</h2>
 360 <div class="sectionbody">
 361 <div class="vlist"><dl>
 362 <dt>
 363 -L &lt;label&gt;
 364 </dt>
 365 <dd>
 366 <p>
 367         This option may be given up to three times, and
 368         specifies labels to be used in place of the
 369         corresponding file names in conflict reports. That is,
 370         <tt>git merge-file -L x -L y -L z a b c</tt> generates output that
 371         looks like it came from files x, y and z instead of
 372         from files a, b and c.
 373 </p>
 374 </dd>
 375 <dt>
 376 -p
 377 </dt>
 378 <dd>
 379 <p>
 380         Send results to standard output instead of overwriting
 381         <tt>&lt;current-file&gt;</tt>.
 382 </p>
 383 </dd>
 384 <dt>
 385 -q
 386 </dt>
 387 <dd>
 388 <p>
 389         Quiet; do not warn about conflicts.
 390 </p>
 391 </dd>
 392 <dt>
 393 --ours
 394 </dt>
 395 <dt>
 396 --theirs
 397 </dt>
 398 <dt>
 399 --union
 400 </dt>
 401 <dd>
 402 <p>
 403         Instead of leaving conflicts in the file, resolve conflicts
 404         favouring our (or their or both) side of the lines.
 405 </p>
 406 </dd>
 407 </dl></div>
 408 </div>
 409 <h2 id="_examples">EXAMPLES</h2>
 410 <div class="sectionbody">
 411 <div class="vlist"><dl>
 412 <dt>
 413 git merge-file README.my README README.upstream
 414 </dt>
 415 <dd>
 416 <p>
 417         combines the changes of README.my and README.upstream since README,
 418         tries to merge them and writes the result into README.my.
 419 </p>
 420 </dd>
 421 <dt>
 422 git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345
 423 </dt>
 424 <dd>
 425 <p>
 426         merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels
 427         <tt>a</tt> and <tt>c</tt> instead of <tt>tmp/a123</tt> and <tt>tmp/c345</tt>.
 428 </p>
 429 </dd>
 430 </dl></div>
 431 </div>
 432 <h2 id="_author">Author</h2>
 433 <div class="sectionbody">
 434 <div class="para"><p>Written by Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;</p></div>
 435 </div>
 436 <h2 id="_documentation">Documentation</h2>
 437 <div class="sectionbody">
 438 <div class="para"><p>Documentation by Johannes Schindelin and the git-list &lt;git@vger.kernel.org&gt;,
 439 with parts copied from the original documentation of RCS <em>merge</em>.</p></div>
 440 </div>
 441 <h2 id="_git">GIT</h2>
 442 <div class="sectionbody">
 443 <div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 444 </div>
 445 <div id="footer">
 446 <div id="footer-text">
 447 Last updated 2010-03-20 20:59:12 UTC
 448 </div>
 449 </div>
 450 </body>
 451 </html>