doc/source/en/TortoiseGit/git_doc/git-merge-tree.html.xml

   1 <?xml version="1.0" encoding="UTF-8"?>\r
   2 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\r
   3 \r
   4 <article lang="en" id="git-merge-tree(1)">\r
   5 <articleinfo>\r
   6     <title>git-merge-tree(1)</title>\r
   7         <indexterm>\r
   8                 <primary>git-merge-tree(1)</primary>\r
   9         </indexterm>\r
  10 </articleinfo>\r
  11 <simplesect id="_name">\r
  12 <title>NAME</title>\r
  13 <simpara>git-merge-tree - Show three-way merge without touching index</simpara>\r
  14 </simplesect>\r
  15 <simplesect id="_synopsis">\r
  16 <title>SYNOPSIS</title>\r
  17 <simpara><emphasis>git merge-tree</emphasis> &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</simpara>\r
  18 </simplesect>\r
  19 <simplesect id="_description">\r
  20 <title>DESCRIPTION</title>\r
  21 <simpara>Reads three treeish, and output trivial merge results and\r
  22 conflicting stages to the standard output.  This is similar to\r
  23 what three-way <emphasis>git read-tree -m</emphasis> does, but instead of storing the\r
  24 results in the index, the command outputs the entries to the\r
  25 standard output.</simpara>\r
  26 <simpara>This is meant to be used by higher level scripts to compute\r
  27 merge results outside of the index, and stuff the results back into the\r
  28 index.  For this reason, the output from the command omits\r
  29 entries that match the &lt;branch1&gt; tree.</simpara>\r
  30 </simplesect>\r
  31 <simplesect id="_author">\r
  32 <title>Author</title>\r
  33 <simpara>Written by Linus Torvalds &lt;<ulink url="mailto:torvalds@osdl.org">torvalds@osdl.org</ulink>&gt;</simpara>\r
  34 </simplesect>\r
  35 <simplesect id="_documentation">\r
  36 <title>Documentation</title>\r
  37 <simpara>Documentation by Junio C Hamano and the git-list &lt;<ulink url="mailto:git@vger.kernel.org">git@vger.kernel.org</ulink>&gt;.</simpara>\r
  38 </simplesect>\r
  39 <simplesect id="_git">\r
  40 <title>GIT</title>\r
  41 <simpara>Part of the <xref linkend="git(1)"/> suite</simpara>\r
  42 </simplesect>\r
  43 </article>\r