From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@xxxxxxx> This also entails changing the help output for the command to match the new synopsis. Signed-off-by: Jean-Noël Avila <jn.avila@xxxxxxx> --- Documentation/git-mv.adoc | 6 ++---- builtin/mv.c | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/git-mv.adoc b/Documentation/git-mv.adoc index dc1bf615341..08d660643fc 100644 --- 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 55a7d471dca..9e36b616ab6 100644 --- 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 }; -- gitgitgadget