Merge branch 'tb/complete-word-diff-regex'

* tb/complete-word-diff-regex:
completion: complete "diff --word-diff-regex="

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 51f5223e2a373a03963ac20e7ebfc65405fb8eef..a2db20c81ff361f360667f3a52fe304ab9f3a89d 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1169,7 +1169,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
                        --no-prefix --src-prefix= --dst-prefix=
                        --inter-hunk-context=
                        --patience --histogram --minimal
-                       --raw --word-diff
+                       --raw --word-diff --word-diff-regex=
                        --dirstat --dirstat= --dirstat-by-file
                        --dirstat-by-file= --cumulative
                        --diff-algorithm=