Merge branch 'bw/pathspec-match-submodule-boundary'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 35df6ce9ea3f37c36e4df78929758dd1a818712e..3683c772c5586ccc1f6dfc8c047919d8d96aa891 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1922,6 +1922,7 @@ _git_pull ()
        --*)
                __gitcomp "
                        --rebase --no-rebase
+                       --autostash --no-autostash
                        $__git_merge_options
                        $__git_fetch_options
                "