summaryrefslogtreecommitdiff
path: root/contrib/completion/git-completion.bash
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-22 21:00:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-22 21:00:24 (GMT)
commitf5c73f69fd711f4814a2e8da78a0a2f4dbb46013 (patch)
tree8189b949645acae74d33f5b3210928b0bb8d58f0 /contrib/completion/git-completion.bash
parentdd4048d1c76f067ad7b339dfb3a5f4765f5ae979 (diff)
parent0af760e26191acd3c5957841461ff224b80b43f7 (diff)
downloadgit-f5c73f69fd711f4814a2e8da78a0a2f4dbb46013.zip
git-f5c73f69fd711f4814a2e8da78a0a2f4dbb46013.tar.gz
git-f5c73f69fd711f4814a2e8da78a0a2f4dbb46013.tar.bz2
Merge branch 'dl/stash-show-untracked'
"git stash show" learned to optionally show untracked part of the stash. * dl/stash-show-untracked: stash show: learn stash.showIncludeUntracked stash show: teach --include-untracked and --only-untracked
Diffstat (limited to 'contrib/completion/git-completion.bash')
-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 7dc6cd8..e1a6695 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3053,7 +3053,7 @@ _git_stash ()
__gitcomp "--name-status --oneline --patch-with-stat"
;;
show,--*)
- __gitcomp "$__git_diff_common_options"
+ __gitcomp "--include-untracked --only-untracked $__git_diff_common_options"
;;
branch,--*)
;;