diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:53:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:53:31 -0700 |
| commit | f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (patch) | |
| tree | 1c680a7b5dffe18723b5a4a84d6475e14445b031 /builtin | |
| parent | Documentation: Document signature showing options (diff) | |
| parent | remote: prefer subcommand name 'remove' to 'rm' (diff) | |
| download | tgif-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.tar.xz | |
Merge branch 'nd/maint-remote-remove' into maint
* nd/maint-remote-remove:
remote: prefer subcommand name 'remove' to 'rm'
Diffstat (limited to 'builtin')
| -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 920262d76e..357d59d667 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -11,7 +11,7 @@ static const char * const builtin_remote_usage[] = { "git remote [-v | --verbose]", "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>", "git remote rename <old> <new>", - "git remote rm <name>", + "git remote remove <name>", "git remote set-head <name> (-a | -d | <branch>)", "git remote [-v | --verbose] show [-n] <name>", "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[] = { - "git remote rm <name>", + "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); |