Merge branch 'jc/error-message-in-cherry-pick'

diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index 2c9cf743c7a097ab955938d023e347e866fbc13e..bff3fbe7459dec090ddb5e5df5ff94cf4b030046 100644 (file)
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -34,7 +34,7 @@ OPTIONS
        condition. An error happens when a source is neither existing nor
         controlled by GIT, or when it would overwrite an existing
         file unless '-f' is given.
--n::
+-n, \--dry-run::
        Do nothing; only show what would happen
 
 
@@ -50,4 +50,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite