summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:03 (GMT)
commitcc329f65a34911999cfbb68bd83c6a54b93e461c (patch)
tree682a221cb84586a25d4b85b264293e5b9bbe90f5
parent619ef648def7f8845f61616fe58d4f38f8563212 (diff)
parente6414b464520595a4ecb8b89a58d609850777671 (diff)
downloadgit-cc329f65a34911999cfbb68bd83c6a54b93e461c.zip
git-cc329f65a34911999cfbb68bd83c6a54b93e461c.tar.gz
git-cc329f65a34911999cfbb68bd83c6a54b93e461c.tar.bz2
Merge branch 'tb/complete-word-diff-regex'
* tb/complete-word-diff-regex: completion: complete "diff --word-diff-regex="
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 51f5223..a2db20c 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=