From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:16:03 +0000 (-0800)
Subject: Merge branch 'tb/complete-word-diff-regex'
X-Git-Tag: v2.8.0-rc0~79
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc329f65a34911999cfbb68bd83c6a54b93e461c?hp=619ef648def7f8845f61616fe58d4f38f8563212

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 51f5223e2a..a2db20c81f 100644
--- 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=