summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-20 15:53:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-20 15:53:31 -0700
commitf9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (patch)
tree1c680a7b5dffe18723b5a4a84d6475e14445b031 /contrib
parentDocumentation: Document signature showing options (diff)
parentremote: prefer subcommand name 'remove' to 'rm' (diff)
downloadtgif-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 '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 5a5b5a0b3c..3b98290349 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -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)