Merge branch 'tb/complete-diff-ignore-blank-lines'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:38 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:38 +0000 (11:38 -0700)
* tb/complete-diff-ignore-blank-lines:
completion: Add --ignore-blank-lines for diff

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