diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2018-04-25 15:36:48 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2018-04-25 15:36:48 -0600 |
| commit | 1481f7aa67df42bdf45953231637194ac200d240 (patch) | |
| tree | 7d41eb6b369e3ab0f25753623c966b69340e54cf /plugins/github | |
| parent | b7b623d6de696b81d213ec666d072851561d5c06 (diff) | |
| parent | 9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8 (diff) | |
| download | zsh-1481f7aa67df42bdf45953231637194ac200d240.tar.gz zsh-1481f7aa67df42bdf45953231637194ac200d240.tar.bz2 zsh-1481f7aa67df42bdf45953231637194ac200d240.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/github')
| -rw-r--r-- | plugins/github/_hub | 2 | ||||
| -rw-r--r-- | plugins/github/github.plugin.zsh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/github/_hub b/plugins/github/_hub index 3a6493878..1833a9c09 100644 --- a/plugins/github/_hub +++ b/plugins/github/_hub @@ -89,6 +89,7 @@ __hub_setup_zsh_fns () { browse:'browse the project on GitHub' compare:'open GitHub compare view' ci-status:'lookup commit in GitHub Status API' + sync:'update local branches from upstream' ) _describe -t hub-commands 'hub command' hub_commands && ret=0 @@ -115,6 +116,7 @@ create browse compare ci-status +sync EOF __git_list_all_commands_without_hub } diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh index 0ab399c97..077f07bd4 100644 --- a/plugins/github/github.plugin.zsh +++ b/plugins/github/github.plugin.zsh @@ -1,8 +1,6 @@ # Set up hub wrapper for git, if it is available; http://github.com/github/hub -if [ "$commands[(I)hub]" ]; then - if hub --version &>/dev/null; then - eval $(hub alias -s zsh) - fi +if (( $+commands[hub] )); then + alias git=hub fi # Functions ################################################################# |