Replace deprecated dashed git commands in usage

aspotashev · gitster · commit 34263de0265a · 2009-02-04T15:08:49.000-08:00
Signed-off-by: Alexander Potashev &lt;aspotashev@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static int verify_one_pack(const char *path, int verbose)`
`107`	`107`	`return err;`
`108`	`108`	`}`
`109`	`109`
`110`		`-static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";`
	`110`	`+static const char verify_pack_usage[] = "git verify-pack [-v] <pack>...";`
`111`	`111`
`112`	`112`	`int cmd_verify_pack(int argc, const char *argv, const char prefix)`
`113`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static void write_tree(unsigned char *sha1)`
`62`	`62`	`write_sha1_file(buf.buf, buf.len, tree_type, sha1);`
`63`	`63`	`}`
`64`	`64`
`65`		`-static const char mktree_usage[] = "git-mktree [-z]";`
	`65`	`+static const char mktree_usage[] = "git mktree [-z]";`
`66`	`66`
`67`	`67`	`int main(int ac, char **av)`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static void generate_id_list(void)`
`73`	`73`	`flush_current_id(patchlen, sha1, &ctx);`
`74`	`74`	`}`
`75`	`75`
`76`		`-static const char patch_id_usage[] = "git-patch-id < patch";`
	`76`	`+static const char patch_id_usage[] = "git patch-id < patch";`
`77`	`77`
`78`	`78`	`int main(int argc, char **argv)`
`79`	`79`	`{`