From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Sep 2012 21:21:58 +0000 (-0700)
Subject: Merge branch 'nd/maint-remote-remove'
X-Git-Tag: v1.8.0-rc0~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=90585604a72aaf56158069023dbcc6a61c6d7d50;p=git.git

Merge branch 'nd/maint-remote-remove'

* nd/maint-remote-remove:
  remote: prefer subcommand name 'remove' to 'rm'
---

90585604a72aaf56158069023dbcc6a61c6d7d50
diff --cc builtin/remote.c
index 8a670d82a,357d59d66..a5a4b2323
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -8,18 -8,18 +8,18 @@@
  #include "refs.h"
  
  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 remove <name>",
 -	"git remote set-head <name> (-a | -d | <branch>)",
 -	"git remote [-v | --verbose] show [-n] <name>",
 -	"git remote prune [-n | --dry-run] <name>",
 -	"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",
 -	"git remote set-branches [--add] <name> <branch>...",
 -	"git remote set-url [--push] <name> <newurl> [<oldurl>]",
 -	"git remote set-url --add <name> <newurl>",
 -	"git remote set-url --delete <name> <url>",
 +	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>"),
 +	N_("git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"),
 +	N_("git remote set-branches [--add] <name> <branch>..."),
 +	N_("git remote set-url [--push] <name> <newurl> [<oldurl>]"),
 +	N_("git remote set-url --add <name> <newurl>"),
 +	N_("git remote set-url --delete <name> <url>"),
  	NULL
  };
  
@@@ -34,7 -34,7 +34,7 @@@ static const char * const builtin_remot
  };
  
  static const char * const builtin_remote_rm_usage[] = {
- 	N_("git remote rm <name>"),
 -	"git remote remove <name>",
++	N_("git remote remove <name>"),
  	NULL
  };