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

* tb/complete-word-diff-regex: completion: complete "diff --word-diff-regex="
git-mirror · Feb 3, 2016 · cc329f6 · cc329f6
2 parents 619ef64 + e6414b4
commit cc329f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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=