aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-04 10:21:07 +0900
committerJunio C Hamano <gitster@pobox.com>2017-06-04 10:21:08 +0900
commit5ecbaaf10172c75d6e398abd510a92ad69f7e015 (patch)
tree65fc8039f1ca84904649474878e4a7b72773b780
parentb522c33b45ddb00970c76c188354c5a4117a2c5a (diff)
parent3851e4483f0d62e677703297218c9bb47325806f (diff)
downloadgit-5ecbaaf10172c75d6e398abd510a92ad69f7e015.tar.gz
git-5ecbaaf10172c75d6e398abd510a92ad69f7e015.tar.xz
Merge branch 'tg/stash-push-fixup' into maint
The shell completion script (in contrib/) learned "git stash" has a new "push" subcommand. * tg/stash-push-fixup: completion: add git stash push
-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 af658995d..3f0124911 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2810,7 +2810,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
@@ -2825,6 +2825,9 @@ _git_stash ()
esac
else
case "$subcommand,$cur" in
+ push,--*)
+ __gitcomp "$save_opts --message"
+ ;;
save,--*)
__gitcomp "$save_opts"
;;