Merge branch 'sp/fetch-optim'

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 937c4a79262d44583849fc81319187fa7fb65579..f0beb412e655f0e188b8a1427b41f72b6cc61239 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -20,11 +20,11 @@ OPTIONS
 <commit>::
        Commit to cherry-pick.
        For a more complete list of ways to spell commits, see
-       "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+       "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
 -e|--edit::
        With this option, `git-cherry-pick` will let you edit the commit
-       message prior committing.
+       message prior to committing.
 
 -x::
        When recording the commit, append to the original commit
@@ -45,7 +45,7 @@ OPTIONS
        default is not to do `-x` so this option is a no-op.
 
 -m parent-number|--mainline parent-number::
-       Usually you cannot revert a merge because you do not know which
+       Usually you cannot cherry-pick a merge because you do not know which
        side of the merge should be considered the mainline.  This
        option specifies the parent number (starting from 1) of
        the mainline and allows cherry-pick to replay the change
@@ -75,4 +75,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite