Merge branch 'jk/notes-merge-from-anywhere'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 880a69a271c36d5ee9ba12034df1cae461ee2bb8..51f5223e2a373a03963ac20e7ebfc65405fb8eef 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1312,6 +1312,7 @@ _git_grep ()
                        --full-name --line-number
                        --extended-regexp --basic-regexp --fixed-strings
                        --perl-regexp
+                       --threads
                        --files-with-matches --name-only
                        --files-without-match
                        --max-depth