git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Martin Ågren" <martin.agren@gmail.com>,
	"Jean-Noël Avila" <jn.avila@free.fr>,
	"Jean-Noël Avila" <jn.avila@free.fr>
Subject: [PATCH v2 4/7] doc: move synopsis git-mv commands in the synopsis section
Date: Sat, 12 Apr 2025 12:20:47 +0000	[thread overview]
Message-ID: <2a129734e3d6c7714186f48f916a48dc7535f91b.1744460450.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1896.v2.git.1744460450.gitgitgadget@gmail.com>

From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>

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>
---
 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


  parent reply	other threads:[~2025-04-12 12:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-30 17:15 [PATCH 0/5] doc: convert git-reset, git-rm and git-mv to new documentation format Jean-Noël Avila via GitGitGadget
2025-03-30 17:16 ` [PATCH 1/5] doc: convert git-reset " Jean-Noël Avila via GitGitGadget
2025-04-04 16:39   ` Martin Ågren
2025-03-30 17:16 ` [PATCH 2/5] doc: fix synopsis analysis logic Jean-Noël Avila via GitGitGadget
2025-04-04 16:39   ` Martin Ågren
2025-04-12  8:58     ` Jean-Noël Avila
2025-03-30 17:16 ` [PATCH 3/5] doc: convert git-rm to new documentation format Jean-Noël Avila via GitGitGadget
2025-03-30 17:16 ` [PATCH 4/5] doc: move synopsis git-mv commands in the synopsis section Jean-Noël Avila via GitGitGadget
2025-04-05 10:57   ` Martin Ågren
2025-03-30 17:16 ` [PATCH 5/5] doc: convert git-mv to new documentation format Jean-Noël Avila via GitGitGadget
2025-04-12 12:20 ` [PATCH v2 0/7] doc: convert git-reset, git-rm and " Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 1/7] doc: convert git-reset " Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 2/7] doc: fix synopsis analysis logic Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 3/7] doc: convert git-rm to new documentation format Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` Jean-Noël Avila via GitGitGadget [this message]
2025-04-12 12:20   ` [PATCH v2 5/7] doc: convert git-mv " Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 6/7] doc: fix asciidoctor synopsis processing of triple-dots Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 7/7] doc: add markup for characters in Guidelines Jean-Noël Avila via GitGitGadget
2025-04-14 21:47   ` [PATCH v2 0/7] doc: convert git-reset, git-rm and git-mv to new documentation format Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2a129734e3d6c7714186f48f916a48dc7535f91b.1744460450.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    --cc=martin.agren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).