Merge branch 'maint'

diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index 2c9cf743c7a097ab955938d023e347e866fbc13e..3b8ca76dff5efb3b5a9f07b459889333518f04ed 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