Merged from master

This commit is contained in:
Sean Carolan 2015-06-07 22:11:13 -05:00
commit 91c9a21002
238 changed files with 7939 additions and 1709 deletions

View file

@ -1,12 +1,23 @@
<<<<<<< HEAD
function gi() { curl http://gitignore.io/api/$@ ;}
_gitignireio_get_command_list() {
curl -s http://gitignore.io/api/list | tr "," "\n"
=======
function gi() { curl -sL https://www.gitignore.io/api/$@ ;}
_gitignoreio_get_command_list() {
curl -sL https://www.gitignore.io/api/list | tr "," "\n"
>>>>>>> upstream/master
}
_gitignireio () {
_gitignoreio () {
compset -P '*,'
compadd -S '' `_gitignireio_get_command_list`
compadd -S '' `_gitignoreio_get_command_list`
}
compdef _gitignireio gi
<<<<<<< HEAD
compdef _gitignireio gi
=======
compdef _gitignoreio gi
>>>>>>> upstream/master