Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d192927c20a1b4bca97a6bea91cc10b0b67bdd29..de193ba7c1caf69367410d763f3541555a64746f 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -881,6 +881,7 @@ _git_help ()
                attributes cli core-tutorial cvs-migration
                diffcore gitk glossary hooks ignore modules
                repository-layout tutorial tutorial-2
+               workflows
                "
 }
 
@@ -1397,6 +1398,8 @@ _git_shortlog ()
 
 _git_show ()
 {
+       __git_has_doubledash && return
+
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)