Merge branch 'vl/grep-configurable-threads'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 69568075191af7b22fc4e9e556cdcd3c19dc7a51..ab4da7f979177a3304eb08d85869c1a141e81064 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