summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:03 -0800
commitcc329f65a34911999cfbb68bd83c6a54b93e461c (patch)
tree682a221cb84586a25d4b85b264293e5b9bbe90f5 /contrib
parentMerge branch 'mk/asciidoctor-bq-workaround' (diff)
parentcompletion: complete "diff --word-diff-regex=" (diff)
downloadtgif-cc329f65a34911999cfbb68bd83c6a54b93e461c.tar.xz
Merge branch 'tb/complete-word-diff-regex'
* tb/complete-word-diff-regex: completion: complete "diff --word-diff-regex="
Diffstat (limited to 'contrib')
-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 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=