--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\r
+\r
+<article lang="en" id="git-cherry-pick(1)">\r
+<articleinfo>\r
+ <title>git-cherry-pick(1)</title>\r
+ <indexterm>\r
+ <primary>git-cherry-pick(1)</primary>\r
+ </indexterm>\r
+</articleinfo>\r
+<simplesect id="_name">\r
+<title>NAME</title>\r
+<simpara>git-cherry-pick - Apply the change introduced by an existing commit</simpara>\r
+</simplesect>\r
+<simplesect id="_synopsis">\r
+<title>SYNOPSIS</title>\r
+<simpara><emphasis>git cherry-pick</emphasis> [--edit] [-n] [-m parent-number] [-s] [-x] <commit></simpara>\r
+</simplesect>\r
+<simplesect id="_description">\r
+<title>DESCRIPTION</title>\r
+<simpara>Given one existing commit, apply the change the patch introduces, and record a\r
+new commit that records it. This requires your working tree to be clean (no\r
+modifications from the HEAD commit).</simpara>\r
+</simplesect>\r
+<simplesect id="_options">\r
+<title>OPTIONS</title>\r
+<variablelist>\r
+<varlistentry>\r
+<term>\r
+<commit>\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ Commit to cherry-pick.\r
+ For a more complete list of ways to spell commits, see the\r
+ "SPECIFYING REVISIONS" section in <xref linkend="git-rev-parse(1)"/>.\r
+</simpara>\r
+</listitem>\r
+</varlistentry>\r
+<varlistentry>\r
+<term>\r
+-e\r
+</term>\r
+<term>\r
+--edit\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ With this option, <emphasis>git-cherry-pick</emphasis> will let you edit the commit\r
+ message prior to committing.\r
+</simpara>\r
+</listitem>\r
+</varlistentry>\r
+<varlistentry>\r
+<term>\r
+-x\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ When recording the commit, append to the original commit\r
+ message a note that indicates which commit this change\r
+ was cherry-picked from. Append the note only for cherry\r
+ picks without conflicts. Do not use this option if\r
+ you are cherry-picking from your private branch because\r
+ the information is useless to the recipient. If on the\r
+ other hand you are cherry-picking between two publicly\r
+ visible branches (e.g. backporting a fix to a\r
+ maintenance branch for an older release from a\r
+ development branch), adding this information can be\r
+ useful.\r
+</simpara>\r
+</listitem>\r
+</varlistentry>\r
+<varlistentry>\r
+<term>\r
+-r\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ It used to be that the command defaulted to do <literal>-x</literal>\r
+ described above, and <literal>-r</literal> was to disable it. Now the\r
+ default is not to do <literal>-x</literal> so this option is a no-op.\r
+</simpara>\r
+</listitem>\r
+</varlistentry>\r
+<varlistentry>\r
+<term>\r
+-m parent-number\r
+</term>\r
+<term>\r
+--mainline parent-number\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ Usually you cannot cherry-pick a merge because you do not know which\r
+ side of the merge should be considered the mainline. This\r
+ option specifies the parent number (starting from 1) of\r
+ the mainline and allows cherry-pick to replay the change\r
+ relative to the specified parent.\r
+</simpara>\r
+</listitem>\r
+</varlistentry>\r
+<varlistentry>\r
+<term>\r
+-n\r
+</term>\r
+<term>\r
+--no-commit\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ Usually the command automatically creates a commit.\r
+ This flag applies the change necessary to cherry-pick\r
+ the named commit to your working tree and the index,\r
+ but does not make the commit. In addition, when this\r
+ option is used, your index does not have to match the\r
+ HEAD commit. The cherry-pick is done against the\r
+ beginning state of your index.\r
+</simpara>\r
+<simpara>This is useful when cherry-picking more than one commits'\r
+effect to your index in a row.</simpara>\r
+</listitem>\r
+</varlistentry>\r
+<varlistentry>\r
+<term>\r
+-s\r
+</term>\r
+<term>\r
+--signoff\r
+</term>\r
+<listitem>\r
+<simpara>\r
+ Add Signed-off-by line at the end of the commit message.\r
+</simpara>\r
+</listitem>\r
+</varlistentry>\r
+</variablelist>\r
+</simplesect>\r
+<simplesect id="_author">\r
+<title>Author</title>\r
+<simpara>Written by Junio C Hamano <<ulink url="mailto:gitster@pobox.com">gitster@pobox.com</ulink>></simpara>\r
+</simplesect>\r
+<simplesect id="_documentation">\r
+<title>Documentation</title>\r
+<simpara>Documentation by Junio C Hamano and the git-list <<ulink url="mailto:git@vger.kernel.org">git@vger.kernel.org</ulink>>.</simpara>\r
+</simplesect>\r
+<simplesect id="_git">\r
+<title>GIT</title>\r
+<simpara>Part of the <xref linkend="git(1)"/> suite</simpara>\r
+</simplesect>\r
+</article>\r
OSDN Git Service
