summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-25 20:22:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-25 20:22:39 (GMT)
commitf0209e80cf4468653e7730881b4c5bdb5fc7389a (patch)
treee14570ac788159987505b0f648398ef0d91c2b74 /contrib
parentf3fec40e8d8798e5313f05a9273aef932fe4519e (diff)
parent9cd4382ad56e9d7557e57ab1d85970a2702fd3e7 (diff)
downloadgit-f0209e80cf4468653e7730881b4c5bdb5fc7389a.zip
git-f0209e80cf4468653e7730881b4c5bdb5fc7389a.tar.gz
git-f0209e80cf4468653e7730881b4c5bdb5fc7389a.tar.bz2
Merge branch 'ls/complete-remote-update-names'
"git remote update" can take both a single remote nickname and a nickname for remote groups, and the completion script (in contrib/) has been taught about it. * ls/complete-remote-update-names: completion: complete remote names too
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index dc2b046..bc31e89 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2362,7 +2362,7 @@ _git_remote ()
__gitcomp_builtin remote_update
;;
update,*)
- __gitcomp "$(__git_get_config_variables "remotes")"
+ __gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
;;
set-url,--*)
__gitcomp_builtin remote_set-url