Documentation(cvs-migration): minor cleanups.

[git.git] / Documentation / git-cherry-pick.txt

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index e6a8c87..a7a883b 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -1,6 +1,5 @@
 git-cherry-pick(1)
 ==================
-v0.99.5 Aug 2005
 
 NAME
 ----
@@ -8,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit.
 
 SYNOPSIS
 --------
-'git-cherry-pick' [-n] [-r] <commit>
+'git-cherry-pick' [--edit] [-n] [-r] <commit>
 
 DESCRIPTION
 -----------
@@ -21,13 +20,17 @@ OPTIONS
 <commit>::
        Commit to cherry-pick.
 
+--edit::
+       With this option, `git-cherry-pick` will let you edit the commit
+       message prior committing.
+
 -r::
-       Usuall the command appends which commit was
+       Usually the command appends 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, and is used by 'git rebase'.
+       before publishing.
 
 -n::
        Usually the command automatically creates a commit with
@@ -38,9 +41,9 @@ OPTIONS
        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.
-
-       This is useful when cherry-picking more than one commits'
-       effect to your working tree in a row.
++
+This is useful when cherry-picking more than one commits'
+effect to your working tree in a row.
 
 
 Author