aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-12 09:47:35 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-12 09:47:35 -0700
commit7d4d742c2347ee11f17f054ffd8d3e3664739e77 (patch)
tree3528a24593eae9ed1317146c27236d31094bb1f7 /contrib
parent2f9c615efb164e62fb27a5d4a50454ae9f5c87ad (diff)
parent2703c22fc290993ade5135f85f0963776398a4df (diff)
downloadgit-7d4d742c2347ee11f17f054ffd8d3e3664739e77.tar.gz
git-7d4d742c2347ee11f17f054ffd8d3e3664739e77.tar.xz
Merge branch 'vs/completion-branch-fully-spelled-d-m-r'
* vs/completion-branch-fully-spelled-d-m-r: completion: complete --delete, --move, and --remotes for git branch
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c1b213554..9c8f7380d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1008,8 +1008,8 @@ _git_branch ()
while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in
- -d|-m) only_local_ref="y" ;;
- -r) has_r="y" ;;
+ -d|--delete|-m|--move) only_local_ref="y" ;;
+ -r|--remotes) has_r="y" ;;
esac
((c++))
done
@@ -1023,7 +1023,7 @@ _git_branch ()
--color --no-color --verbose --abbrev= --no-abbrev
--track --no-track --contains --merged --no-merged
--set-upstream-to= --edit-description --list
- --unset-upstream
+ --unset-upstream --delete --move --remotes
"
;;
*)