Autogenerated man pages for v1.4.2.3-gabd697

diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1
index 0c7832867b115200cba5a52fee6a18d8492a0420..67ccd2ec44057042448e50f010195e925346e480 100755 (executable)
--- a/man1/git-cherry-pick.1
+++ b/man1/git-cherry-pick.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHERRY\-PICK" "1" "10/03/2006" "" ""
+.TH "GIT\-CHERRY\-PICK" "1" "10/06/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -10,7 +10,7 @@
 .SH "NAME"
 git\-cherry\-pick \- Apply the change introduced by an existing commit
 .SH "SYNOPSIS"
-\fIgit\-cherry\-pick\fR [\-\-edit] [\-n] [\-r] <commit>
+\fIgit\-cherry\-pick\fR [\-\-edit] [\-n] [\-x] <commit>
 .sp
 .SH "DESCRIPTION"
 Given one existing commit, apply the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no modifications from the HEAD commit).
@@ -25,9 +25,17 @@ With this option,
 git\-cherry\-pick
 will let you edit the commit message prior committing.
 .TP
+\-x
+Cause the command to append which commit was cherry\-picked after the original commit message when 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.
+.TP
 \-r|\-\-replay
-Usually the command appends which commit was cherry\-picked after the original commit message when making a commit. This option,
-\fI\-\-replay\fR, causes it to use the original commit message intact. This is useful when you are reordering the patches in your private tree before publishing.
+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.
 .TP
 \-n|\-\-no\-commit
 Usually the command automatically creates a commit with a commit log message stating which commit was cherry\-picked. This flag applies the change necessary to cherry\-pick the named commit to your working tree, but does not make the commit. In addition, when this option is used, your working tree does not have to match the HEAD commit. The cherry\-pick is done against the beginning state of your working tree.