diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-12 14:21:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 14:21:58 -0700 |
| commit | 90585604a72aaf56158069023dbcc6a61c6d7d50 (patch) | |
| tree | 9a13a38bfbe96699c56686e385793840bda6ee24 /builtin/remote.c | |
| parent | 2cdfb602a4e4ca6896a2e0baf0b8d4424ad2f7aa (diff) | |
| parent | e17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff) | |
| download | git-90585604a72aaf56158069023dbcc6a61c6d7d50.tar.gz git-90585604a72aaf56158069023dbcc6a61c6d7d50.tar.xz | |
Merge branch 'nd/maint-remote-remove'
* nd/maint-remote-remove:
remote: prefer subcommand name 'remove' to 'rm'
Diffstat (limited to 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 8a670d82a..a5a4b2323 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -11,7 +11,7 @@ static const char * const builtin_remote_usage[] = { N_("git remote [-v | --verbose]"), N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"), N_("git remote rename <old> <new>"), - N_("git remote rm <name>"), + N_("git remote remove <name>"), N_("git remote set-head <name> (-a | -d | <branch>)"), N_("git remote [-v | --verbose] show [-n] <name>"), N_("git remote prune [-n | --dry-run] <name>"), @@ -34,7 +34,7 @@ static const char * const builtin_remote_rename_usage[] = { }; static const char * const builtin_remote_rm_usage[] = { - N_("git remote rm <name>"), + N_("git remote remove <name>"), NULL }; @@ -1580,7 +1580,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix) result = add(argc, argv); else if (!strcmp(argv[0], "rename")) result = mv(argc, argv); - else if (!strcmp(argv[0], "rm")) + else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove")) result = rm(argc, argv); else if (!strcmp(argv[0], "set-head")) result = set_head(argc, argv); |