Merge branch 'nd/maint-remote-remove' into maint

* nd/maint-remote-remove:
  remote: prefer subcommand name 'remove' to 'rm'
This commit is contained in:
Junio C Hamano
2012-09-20 15:53:31 -07:00
5 changed files with 10 additions and 9 deletions

View File

@ -2040,7 +2040,7 @@ _git_config ()
_git_remote ()
{
local subcommands="add rename rm set-head set-branches set-url show prune update"
local subcommands="add rename remove set-head set-branches set-url show prune update"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
__gitcomp "$subcommands"
@ -2048,7 +2048,7 @@ _git_remote ()
fi
case "$subcommand" in
rename|rm|set-url|show|prune)
rename|remove|set-url|show|prune)
__gitcomp_nl "$(__git_remotes)"
;;
set-head|set-branches)