diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:17 (GMT) |
| commit | 081363dde231346c2f051cd7d41622f6fa02e3cb (patch) | |
| tree | b2d9959ba9a2cd8d463113867d30d96ba48d2d05 /contrib | |
| parent | 0a8748d8e160f613b692f904161f19e120645e61 (diff) | |
| parent | e6414b464520595a4ecb8b89a58d609850777671 (diff) | |
| download | git-081363dde231346c2f051cd7d41622f6fa02e3cb.zip git-081363dde231346c2f051cd7d41622f6fa02e3cb.tar.gz git-081363dde231346c2f051cd7d41622f6fa02e3cb.tar.bz2 | |
Merge branch 'tb/complete-word-diff-regex' into maint
* tb/complete-word-diff-regex:
completion: complete "diff --word-diff-regex="
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 59a51fe..63f5c04 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= |