OSDN Git Service

Add Git official document to help
[tortoisegit/TortoiseGitJp.git] / doc / source / en / TortoiseGit / git_doc / git-merge-one-file.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-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 <simpara><emphasis>git-merge-one-file</emphasis></simpara>\r
18 </simplesect>\r
19 <simplesect id="_description">\r
20 <title>DESCRIPTION</title>\r
21 <simpara>This is the standard helper program to use with <emphasis>git-merge-index</emphasis>\r
22 to resolve a merge after the trivial merge done with <emphasis>git-read-tree -m</emphasis>.</simpara>\r
23 </simplesect>\r
24 <simplesect id="_author">\r
25 <title>Author</title>\r
26 <simpara>Written by Linus Torvalds &lt;<ulink url="mailto:torvalds@osdl.org">torvalds@osdl.org</ulink>&gt;,\r
27 Junio C Hamano &lt;<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>&gt; and Petr Baudis &lt;<ulink url="mailto:pasky@suse.cz">pasky@suse.cz</ulink>&gt;.</simpara>\r
28 </simplesect>\r
29 <simplesect id="_documentation">\r
30 <title>Documentation</title>\r
31 <simpara>Documentation by David Greaves, Junio C Hamano and the git-list &lt;<ulink url="mailto:git@vger.kernel.org">git@vger.kernel.org</ulink>&gt;.</simpara>\r
32 </simplesect>\r
33 <simplesect id="_git">\r
34 <title>GIT</title>\r
35 <simpara>Part of the <xref linkend="git(1)"/> suite</simpara>\r
36 </simplesect>\r
37 </article>\r