Replace deprecated dashed git commands in usage
Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexander Potashev committed
Jan 4, 2009 at 21:39 UTC
34263de0265a484bf44058819a363bb1e627c0ce
10 files changed
+11
-11
builtin-merge.c
+2
-2
@@ -36,8 +36,8 @@ struct strategy {
36
};
37
38
static const char * const builtin_merge_usage[] = {
39
- "git-merge [options] <remote>...",
40
- "git-merge [options] <msg> HEAD <remote>",
39
+ "git merge [options] <remote>...",
40
+ "git merge [options] <msg> HEAD <remote>",
41
NULL
42
};
43
builtin-receive-pack.c
+1
-1
@@ -9,7 +9,7 @@
9
#include "remote.h"
10
#include "transport.h"
11
12
-static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
12
+static const char receive_pack_usage[] = "git receive-pack <git-dir>";
13
14
enum deny_action {
15
DENY_IGNORE,
builtin-verify-pack.c
+1
-1
@@ -107,7 +107,7 @@ static int verify_one_pack(const char *path, int verbose)
107
return err;
108
}
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
112
int cmd_verify_pack(int argc, const char **argv, const char *prefix)
113
{
merge-index.c
+1
-1
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
92
signal(SIGCHLD, SIG_DFL);
93
94
if (argc < 3)
95
- usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
95
+ usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
96
97
git_extract_argv0_path(argv[0]);
98
merge-tree.c
+1
-1
@@ -4,7 +4,7 @@
4
#include "blob.h"
5
#include "exec_cmd.h"
6
7
-static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>";
7
+static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
8
static int resolve_directories = 1;
9
10
struct merge_list {
mktag.c
+1
-1
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
158
unsigned char result_sha1[20];
159
160
if (argc != 1)
161
- usage("git-mktag < signaturefile");
161
+ usage("git mktag < signaturefile");
162
163
git_extract_argv0_path(argv[0]);
164
mktree.c
+1
-1
@@ -62,7 +62,7 @@ static void write_tree(unsigned char *sha1)
62
write_sha1_file(buf.buf, buf.len, tree_type, sha1);
63
}
64
65
-static const char mktree_usage[] = "git-mktree [-z]";
65
+static const char mktree_usage[] = "git mktree [-z]";
66
67
int main(int ac, char **av)
68
{
patch-id.c
+1
-1
@@ -73,7 +73,7 @@ static void generate_id_list(void)
73
flush_current_id(patchlen, sha1, &ctx);
74
}
75
76
-static const char patch_id_usage[] = "git-patch-id < patch";
76
+static const char patch_id_usage[] = "git patch-id < patch";
77
78
int main(int argc, char **argv)
79
{
unpack-file.c
+1
-1
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
29
git_extract_argv0_path(argv[0]);
30
31
if (argc != 2)
32
- usage("git-unpack-file <sha1>");
32
+ usage("git unpack-file <sha1>");
33
if (get_sha1(argv[1], sha1))
34
die("Not a valid object name %s", argv[1]);
35
upload-pack.c
+1
-1
@@ -11,7 +11,7 @@
11
#include "list-objects.h"
12
#include "run-command.h"
13
14
-static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
14
+static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>";
15
16
/* bits #0..7 in revision.h, #8..10 in commit.c */
17
#define THEY_HAVE (1u << 11)