Merge branch 'nd/maint-remote-remove'

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

diff --cc builtin/remote.c
index 8a670d82a74017d0f7b27a5b5b5232abf32d2816,357d59d66792308c4c4d767523767c6d078d7341..a5a4b232310a27c1d67dd6a1bce252cd62cfa52d
--- 1/builtin/remote.c
--- 2/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
  };
  

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc t/t5505-remote.sh
Simple merge

diff --cc t/t5540-http-push.sh
Simple merge