Merge branch 'tb/complete-word-diff-regex' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:17 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:17 +0000 (14:54 -0800)
* tb/complete-word-diff-regex:
completion: complete "diff --word-diff-regex="

1  2 
contrib/completion/git-completion.bash
Simple merge