aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 14:21:58 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-12 14:21:58 -0700
commit90585604a72aaf56158069023dbcc6a61c6d7d50 (patch)
tree9a13a38bfbe96699c56686e385793840bda6ee24 /contrib
parent2cdfb602a4e4ca6896a2e0baf0b8d4424ad2f7aa (diff)
parente17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff)
downloadgit-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 'contrib')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 222b804ce..0492db924 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2032,7 +2032,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"
@@ -2040,7 +2040,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)