Merge branch 'sp/complete-ext-alias'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:23:27 +0000 (12:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:23:27 +0000 (12:23 -0700)
* sp/complete-ext-alias:
completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases

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