summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-29 12:34:52 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-29 12:34:52 +0900
commit6f7f11f7aa7b95c1555cd389a219f76ee30b5cc7 (patch)
treedc2335fa6c0c3317f0aa2bf64da5f3ed2e76aaba /contrib
parent2becdbd47e14aad542875450e8f9c8e114109bfd (diff)
parent3851e4483f0d62e677703297218c9bb47325806f (diff)
downloadgit-6f7f11f7aa7b95c1555cd389a219f76ee30b5cc7.tar.gz
Merge branch 'tg/stash-push-fixup'
The shell completion script (in contrib/) learned "git stash" has a new "push" subcommand. * tg/stash-push-fixup: completion: add git stash push
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1ed0a09fee..45a78a0953 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2813,7 +2813,7 @@ _git_show_branch ()
_git_stash ()
{
local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
- local subcommands='save list show apply clear drop pop create branch'
+ local subcommands='push save list show apply clear drop pop create branch'
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
case "$cur" in
@@ -2828,6 +2828,9 @@ _git_stash ()
esac
else
case "$subcommand,$cur" in
+ push,--*)
+ __gitcomp "$save_opts --message"
+ ;;
save,--*)
__gitcomp "$save_opts"
;;