kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Replace deprecated dashed git commands in usage 

Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Alexander Potashev 2009-01-04 21:39:27 +03:00 committed by Junio C Hamano
parent 5c7eee03da
commit 34263de026
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-merge.c
View File

@ -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
};


2
builtin-receive-pack.c
View File

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

2
builtin-verify-pack.c
View File

@ -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)
{

2
merge-index.c
View File

@ -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]);


2
merge-tree.c
View File

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

2
mktag.c
View File

@ -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]);


2
mktree.c
View File

@ -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)
{

2
patch-id.c
View File

@ -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)
{

2
unpack-file.c
View File

@ -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]);


2
upload-pack.c
View File

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