Replace deprecated dashed git commands in usage

Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-merge.c b/builtin-merge.c
index e4555b01996050db8d2909bc6e6bf5110b2bf4c9..885fad9bba1310e6ed8424f9d4b481e066760a9b 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -36,8 +36,8 @@ struct strategy {
 };
 
 static const char * const builtin_merge_usage[] = {
 };
 
 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
 };
 
        NULL
 };
 

diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index 6564a97cefe9061ec94f5db6eb945a405376d02f..596dfe92233e9ad07cebfa7e36a404ea909da716 100644 (file)
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@ -9,7 +9,7 @@
 #include "remote.h"
 #include "transport.h"
 
 #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,
 
 enum deny_action {
        DENY_IGNORE,

diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c
index 25a29f11a4b9642c1bd367b81779d8f09ae04604..0ee0a9af60b0601fe0e6db98ec582e059f5e9064 100644 (file)
--- 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;
 }
 
        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)
 {
 
 int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 {

diff --git a/merge-index.c b/merge-index.c
index c00a2b385a3373f88b9fd3f087d9681cdc46cbf6..aa9cf23a39ae271a53d1a0c05ac99be0e832b46a 100644 (file)
--- 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)
        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]);
 
 
        git_extract_argv0_path(argv[0]);
 

diff --git a/merge-tree.c b/merge-tree.c
index f18201acdb21f7eb3e09a546382417851b572fd4..f01e7c81aebea84b95154c9076af66979e52715f 100644 (file)
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -4,7 +4,7 @@
 #include "blob.h"
 #include "exec_cmd.h"
 
 #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 {
 static int resolve_directories = 1;
 
 struct merge_list {

diff --git a/mktag.c b/mktag.c
index 6d5083eaf04b9ad1b54dad5eaca33d9a73373bbd..99a356e9ee75cb247d80ed6dc0b251ceb0bd9e46 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
        unsigned char result_sha1[20];
 
        if (argc != 1)
        unsigned char result_sha1[20];
 
        if (argc != 1)

-               usage("git-mktag < signaturefile");
+               usage("git mktag < signaturefile");

 
        git_extract_argv0_path(argv[0]);
 
 
        git_extract_argv0_path(argv[0]);
 

diff --git a/mktree.c b/mktree.c
index 6283bc3d431eca77e79970d1de59c61ac36af028..137a0950f686691740ac87330cf0ac7bdea8b1e7 100644 (file)
--- 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);
 }
 
        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)
 {
 
 int main(int ac, char **av)
 {

diff --git a/patch-id.c b/patch-id.c
index 3660ad461d359a7fb968692f40cea75c9764f61a..0df4cb086ba26d1f4d56b8347a6a7bcf219832f5 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -73,7 +73,7 @@ static void generate_id_list(void)
        flush_current_id(patchlen, sha1, &ctx);
 }
 
        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)
 {
 
 int main(int argc, char **argv)
 {

diff --git a/unpack-file.c b/unpack-file.c
index 6dd8ad02fbb05ca9124473d29132d31f0e14ede0..75cd2f1a6adf3ea773a6acc3f1e7f122e30676e5 100644 (file)
--- 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)
        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]);
 
        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 5db6f939551dff618b9e4c7a8bbf5a51bfa3032f..19c24db643c0bceb6e1b960d411d657d2feb0f32 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -11,7 +11,7 @@
 #include "list-objects.h"
 #include "run-command.h"
 
 #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)
 
 /* bits #0..7 in revision.h, #8..10 in commit.c */
 #define THEY_HAVE      (1u << 11)