From: Junio C Hamano <junio@hera.kernel.org>
Date: Fri, 6 Oct 2006 01:00:40 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.2.3-gabd697
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af2b8c5c299e8dfe955beb3fd98d3904a6a19951;p=git.git

Autogenerated HTML docs for v1.4.2.3-gabd697
---

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index f4fd6b218..f7f0449fb 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -272,7 +272,7 @@ git-cherry-pick(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-cherry-pick</em> [--edit] [-n] [-r] &lt;commit&gt;</p>
+<p><em>git-cherry-pick</em> [--edit] [-n] [-x] &lt;commit&gt;</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -301,16 +301,30 @@ modifications from the HEAD commit).</p>
 </p>
 </dd>
 <dt>
--r|--replay
+-x
 </dt>
 <dd>
 <p>
-        Usually the command appends which commit was
+        Cause the command to append which commit was
         cherry-picked after the original commit message when
-        making a commit.  This option, <em>--replay</em>, causes it to
-        use the original commit message intact.  This is useful
-        when you are reordering the patches in your private tree
-        before publishing.
+        making a commit.  Do not use this option if you are
+        cherry-picking from your private branch because the
+        information is useless to the recipient.  If on the
+        other hand you are cherry-picking between two publicly
+        visible branches (e.g. backporting a fix to a
+        maintenance branch for an older release from a
+        development branch), adding this information can be
+        useful.
+</p>
+</dd>
+<dt>
+-r|--replay
+</dt>
+<dd>
+<p>
+        It used to be that the command defaulted to do <tt>-x</tt>
+        described above, and <tt>-r</tt> was to disable it.  Now the
+        default is not to do <tt>-x</tt> so this option is a no-op.
 </p>
 </dd>
 <dt>
@@ -346,7 +360,7 @@ effect to your working tree in a row.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:40:55 UTC
+Last updated 06-Oct-2006 01:00:24 UTC
 </div>
 </div>
 </body>
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index bfa950ca1..875edb6b9 100644
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
 
 SYNOPSIS
 --------
-'git-cherry-pick' [--edit] [-n] [-r] <commit>
+'git-cherry-pick' [--edit] [-n] [-x] <commit>
 
 DESCRIPTION
 -----------
@@ -24,13 +24,22 @@ OPTIONS
 	With this option, `git-cherry-pick` will let you edit the commit
 	message prior committing.
 
--r|--replay::
-	Usually the command appends which commit was
+-x::
+	Cause the command to append which commit was
 	cherry-picked after the original commit message when
-	making a commit.  This option, '--replay', causes it to
-	use the original commit message intact.  This is useful
-	when you are reordering the patches in your private tree
-	before publishing.
+	making a commit.  Do not use this option if you are
+	cherry-picking from your private branch because the
+	information is useless to the recipient.  If on the
+	other hand you are cherry-picking between two publicly
+	visible branches (e.g. backporting a fix to a
+	maintenance branch for an older release from a
+	development branch), adding this information can be
+	useful.
+
+-r|--replay::
+	It used to be that the command defaulted to do `-x`
+	described above, and `-r` was to disable it.  Now the
+	default is not to do `-x` so this option is a no-op.
 
 -n|--no-commit::
 	Usually the command automatically creates a commit with