diff options
| author | Pat Regan <thehead@patshead.com> | 2011-04-20 01:29:58 -0400 |
|---|---|---|
| committer | Pat Regan <thehead@patshead.com> | 2011-04-20 01:29:58 -0400 |
| commit | 655e6e8df0aaba7da9a4a35a3c2017a9050fa99d (patch) | |
| tree | 0eeaba5ff7b8453a7cc94cdc0ad2d9c1b951afbf /plugins | |
| parent | 796f5164f306da2f4e6ab7cbadc17b78f5f683af (diff) | |
| parent | 971b071dc67f423d8b2a6f476e1dd58819049f41 (diff) | |
| download | zsh-655e6e8df0aaba7da9a4a35a3c2017a9050fa99d.tar.gz zsh-655e6e8df0aaba7da9a4a35a3c2017a9050fa99d.tar.bz2 zsh-655e6e8df0aaba7da9a4a35a3c2017a9050fa99d.zip | |
Merge remote branch 'upstream/master'
Conflicts:
plugins/github/github.plugin.zsh
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 15 | ||||
| -rw-r--r-- | plugins/github/github.plugin.zsh | 11 | ||||
| -rw-r--r-- | plugins/npm/_npm | 19 | ||||
| -rw-r--r-- | plugins/npm/npm.plugin.zsh | 4 |
4 files changed, 40 insertions, 9 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 8470c28a4..bc340e86b 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -6,24 +6,21 @@ compdef _git gst=git-status alias gl='git pull' compdef _git gl=git-pull alias gup='git fetch && git rebase' -compdef gup=git +compdef _git gup=git-fetch alias gp='git push' compdef _git gp=git-push -alias gd='git diff | mate' -# WTF is mate?? -compdef _git gd=git-diff -alias gdv='git diff -w "$@" | vim -R -' -compdef gdv=git +gdv() { git-diff -w "$@" | view - } +compdef _git gdv=git-diff alias gc='git commit -v' -compdef gc=git +compdef _git gc=git-commit alias gca='git commit -v -a' -compdef gca=git +compdef _git gca=git-commit alias gco='git checkout' compdef _git gco=git-checkout alias gb='git branch' compdef _git gb=git-branch alias gba='git branch -a' -compdef gba=git +compdef _git gba=git-branch alias gcount='git shortlog -sn' compdef gcount=git alias gcp='git cherry-pick' diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh new file mode 100644 index 000000000..8d4580654 --- /dev/null +++ b/plugins/github/github.plugin.zsh @@ -0,0 +1,11 @@ +# hub alias from defunkt +# https://github.com/defunkt/hub +if [ "$commands[(I)hub]" ]; then + # eval `hub alias -s zsh` + function git(){hub "$@"} +fi + +# add github completion function to path +fpath=($ZSH/plugins/github $fpath) +autoload -U compinit +compinit -i diff --git a/plugins/npm/_npm b/plugins/npm/_npm new file mode 100644 index 000000000..24b536188 --- /dev/null +++ b/plugins/npm/_npm @@ -0,0 +1,19 @@ +#compdef npm + +# Node Package Manager 0.3.15 completion, letting npm do all the completion work + +_npm() { + compadd -- $(_npm_complete $words) +} + +# We want to show all errors of any substance, but never the "npm (not )ok" one. +# (Also doesn't consider "ERR! no match found" worth breaking the terminal for.) +_npm_complete() { + local ask_npm + ask_npm=(npm completion --color false --loglevel error -- $@) + { _call_program npm $ask_npm 2>&1 >&3 \ + | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \ + } 3>&1 +} + +_npm "$@" diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh new file mode 100644 index 000000000..826f0f7b0 --- /dev/null +++ b/plugins/npm/npm.plugin.zsh @@ -0,0 +1,4 @@ +# add npm completion function to path +fpath=($ZSH/plugins/npm $fpath) +autoload -U compinit +compinit -i |