Sync with maint
commit3e7a5b489e45ae8a3a0b222893d58b172d883136
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2013 18:26:41 +0000 (21 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2013 18:26:41 +0000 (21 11:26 -0700)
tree414440d565cccd07146c0f31f4ff7336aaebf5c1
parent266f1fdfa99f5d29ca7ce455966e7960c00a82e4
parentc0add3073a5bd0e295cdaea76e5c9b7805f8a047
Sync with maint

* maint:
  completion: complete diff --word-diff
contrib/completion/git-completion.bash