doc: move synopsis git-mv commands in the synopsis section

This also entails changing the help output for the command to match the new
synopsis.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-mv.adoc b/Documentation/git-mv.adoc
index dc1bf61534106ac8c9e916ba47bb7fb0f1bf97f0..08d660643fc540f8c517f56108e4d3b0b6d1c78d 100644 (file)
--- a/Documentation/git-mv.adoc
+++ b/Documentation/git-mv.adoc
@@ -9,15 +9,13 @@ git-mv - Move or rename a file, a directory, or a symlink
 SYNOPSIS
 --------
 [verse]
-'git mv' [<options>] <source>... <destination>
+'git mv' [-v] [-f] [-n] [-k] <source> <destination>
+'git mv' [-v] [-f] [-n] [-k] <source> ... <destination-directory>
 
 DESCRIPTION
 -----------
 Move or rename a file, directory, or symlink.
 
- git mv [-v] [-f] [-n] [-k] <source> <destination>
- git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory>
-
 In the first form, it renames <source>, which must exist and be either
 a file, symlink or directory, to <destination>.
 In the second form, the last argument has to be an existing

diff --git a/builtin/mv.c b/builtin/mv.c
index 55a7d471dca0126c86add94f4577f0c9795fb0d6..9e36b616ab6a4bbb3714e478c80e354db491e4ca 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -28,7 +28,8 @@
 #include "entry.h"
 
 static const char * const builtin_mv_usage[] = {
-       N_("git mv [<options>] <source>... <destination>"),
+       N_("git mv [-v] [-f] [-n] [-k] <source> <destination>"),
+       N_("git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory>"),
        NULL
 };