merge-recursive: Move rename/delete handling into dedicated function

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index ca485dbac19da231eca045bcf55c6b5df87e8dec..2cef579316ba11e68d65dc4d7309f2e56a465b3d 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -20,8 +20,8 @@ OPTIONS
 -------
 <commit>...::
        Commits to cherry-pick.
-       For a more complete list of ways to spell commits, see the
-       "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
+       For a more complete list of ways to spell commits, see
+       linkgit:gitrevisions[1].
        Sets of commits can be passed but no traversal is done by
        default, as if the '--no-walk' option was specified, see
        linkgit:git-rev-list[1].