Autogenerated HTML docs for v1.4.2.3-gabd697

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index f4fd6b218ceb74375e986b852a82f2a2cc8d2396..f7f0449fbf3f8a9e9c35950836f4bf00eb4d1679 100644 (file)
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -272,7 +272,7 @@ git-cherry-pick(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-cherry-pick</em> [--edit] [-n] [-r] &lt;commit&gt;</p>\r
+<p><em>git-cherry-pick</em> [--edit] [-n] [-x] &lt;commit&gt;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -301,16 +301,30 @@ modifications from the HEAD commit).</p>
 </p>\r
 </dd>\r
 <dt>\r
--r|--replay\r
+-x\r
 </dt>\r
 <dd>\r
 <p>\r
-        Usually the command appends which commit was\r
+        Cause the command to append which commit was\r
         cherry-picked after the original commit message when\r
-        making a commit.  This option, <em>--replay</em>, causes it to\r
-        use the original commit message intact.  This is useful\r
-        when you are reordering the patches in your private tree\r
-        before publishing.\r
+        making a commit.  Do not use this option if you are\r
+        cherry-picking from your private branch because the\r
+        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
+</p>\r
+</dd>\r
+<dt>\r
+-r|--replay\r
+</dt>\r
+<dd>\r
+<p>\r
+        It used to be that the command defaulted to do <tt>-x</tt>\r
+        described above, and <tt>-r</tt> was to disable it.  Now the\r
+        default is not to do <tt>-x</tt> so this option is a no-op.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -346,7 +360,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:40:55 UTC\r
+Last updated 06-Oct-2006 01:00:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index bfa950ca19c701bd3837a874bbeeb18b440ed44f..875edb6b9f5ddc6d19b2de29cebbad5ebb7d37a0 100644 (file)
--- 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