From 34263de0265a484bf44058819a363bb1e627c0ce Mon Sep 17 00:00:00 2001
From: Alexander Potashev <aspotashev@gmail.com>
Date: Sun, 4 Jan 2009 21:39:27 +0300
Subject: [PATCH] Replace deprecated dashed git commands in usage

Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-merge.c        | 4 ++--
 builtin-receive-pack.c | 2 +-
 builtin-verify-pack.c  | 2 +-
 merge-index.c          | 2 +-
 merge-tree.c           | 2 +-
 mktag.c                | 2 +-
 mktree.c               | 2 +-
 patch-id.c             | 2 +-
 unpack-file.c          | 2 +-
 upload-pack.c          | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/builtin-merge.c b/builtin-merge.c
index e4555b019..885fad9bb 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -36,8 +36,8 @@ struct strategy {
 };
 
 static const char * const builtin_merge_usage[] = {
-	"git-merge [options] <remote>...",
-	"git-merge [options] <msg> HEAD <remote>",
+	"git merge [options] <remote>...",
+	"git merge [options] <msg> HEAD <remote>",
 	NULL
 };
 
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index 6564a97ce..596dfe922 100644
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@ -9,7 +9,7 @@
 #include "remote.h"
 #include "transport.h"
 
-static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
+static const char receive_pack_usage[] = "git receive-pack <git-dir>";
 
 enum deny_action {
 	DENY_IGNORE,
diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c
index 25a29f11a..0ee0a9af6 100644
--- a/builtin-verify-pack.c
+++ b/builtin-verify-pack.c
@@ -107,7 +107,7 @@ static int verify_one_pack(const char *path, int verbose)
 	return err;
 }
 
-static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
+static const char verify_pack_usage[] = "git verify-pack [-v] <pack>...";
 
 int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 {
diff --git a/merge-index.c b/merge-index.c
index c00a2b385..aa9cf23a3 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	signal(SIGCHLD, SIG_DFL);
 
 	if (argc < 3)
-		usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+		usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
 
 	git_extract_argv0_path(argv[0]);
 
diff --git a/merge-tree.c b/merge-tree.c
index f18201acd..f01e7c81a 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -4,7 +4,7 @@
 #include "blob.h"
 #include "exec_cmd.h"
 
-static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>";
+static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
 static int resolve_directories = 1;
 
 struct merge_list {
diff --git a/mktag.c b/mktag.c
index 6d5083eaf..99a356e9e 100644
--- a/mktag.c
+++ b/mktag.c
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
 	unsigned char result_sha1[20];
 
 	if (argc != 1)
-		usage("git-mktag < signaturefile");
+		usage("git mktag < signaturefile");
 
 	git_extract_argv0_path(argv[0]);
 
diff --git a/mktree.c b/mktree.c
index 6283bc3d4..137a0950f 100644
--- a/mktree.c
+++ b/mktree.c
@@ -62,7 +62,7 @@ static void write_tree(unsigned char *sha1)
 	write_sha1_file(buf.buf, buf.len, tree_type, sha1);
 }
 
-static const char mktree_usage[] = "git-mktree [-z]";
+static const char mktree_usage[] = "git mktree [-z]";
 
 int main(int ac, char **av)
 {
diff --git a/patch-id.c b/patch-id.c
index 3660ad461..0df4cb086 100644
--- a/patch-id.c
+++ b/patch-id.c
@@ -73,7 +73,7 @@ static void generate_id_list(void)
 	flush_current_id(patchlen, sha1, &ctx);
 }
 
-static const char patch_id_usage[] = "git-patch-id < patch";
+static const char patch_id_usage[] = "git patch-id < patch";
 
 int main(int argc, char **argv)
 {
diff --git a/unpack-file.c b/unpack-file.c
index 6dd8ad02f..75cd2f1a6 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
 	git_extract_argv0_path(argv[0]);
 
 	if (argc != 2)
-		usage("git-unpack-file <sha1>");
+		usage("git unpack-file <sha1>");
 	if (get_sha1(argv[1], sha1))
 		die("Not a valid object name %s", argv[1]);
 
diff --git a/upload-pack.c b/upload-pack.c
index 5db6f9395..19c24db64 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -11,7 +11,7 @@
 #include "list-objects.h"
 #include "run-command.h"
 
-static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
+static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>";
 
 /* bits #0..7 in revision.h, #8..10 in commit.c */
 #define THEY_HAVE	(1u << 11)
-- 
2.30.2