doc/source/en/TortoiseGit/git_doc/git-merge-one-file.xml

   1 <?xml version="1.0" encoding="UTF-8"?>\r
   2 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">\r
   3 \r
   4 <article lang="en" id="git-merge-one-file(1)">\r
   5 <articleinfo>\r
   6     <title>git-merge-one-file(1)</title>\r
   7 <indexterm>\r
   8 <primary>git-merge-one-file(1)</primary>\r
   9 </indexterm>\r
  10 </articleinfo>\r
  11 <simplesect id="_name">\r
  12 <title>NAME</title>\r
  13 <simpara>git-merge-one-file - The standard helper program to use with git-merge-index</simpara>\r
  14 </simplesect>\r
  15 <simplesect id="_synopsis">\r
  16 <title>SYNOPSIS</title>\r
  17 <blockquote>\r
  18 <literallayout><emphasis>git merge-one-file</emphasis></literallayout>\r
  19 </blockquote>\r
  20 </simplesect>\r
  21 <simplesect id="_description">\r
  22 <title>DESCRIPTION</title>\r
  23 <simpara>This is the standard helper program to use with <emphasis>git merge-index</emphasis>\r
  24 to resolve a merge after the trivial merge done with <emphasis>git read-tree -m</emphasis>.</simpara>\r
  25 </simplesect>\r
  26 <simplesect id="_git">\r
  27 <title>GIT</title>\r
  28 <simpara>Part of the <xref linkend="git(1)" /> suite</simpara>\r
  29 </simplesect>\r
  30 </article>\r