linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 38aed4ea95 into c2ae9e09ca

Browse source
This commit is contained in:
J. Randall Hunt 2012-10-15 13:07:09 -07:00
commit 53adf7ca3a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/git/git.plugin.zsh
View file

@ -61,9 +61,9 @@ function current_repository() {
} }
# these aliases take advantage of the previous function # these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)' alias ggpull='git pull origin --rebase $(current_branch)'
compdef ggpull=git compdef ggpull=git
alias ggpush='git push origin $(current_branch)' alias ggpush='git push origin $(current_branch)'
compdef ggpush=git compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' alias ggpnp='git pull origin --rebase $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git compdef ggpnp=git

2
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -1,5 +1,5 @@
WRAPPER_FOUND=0 WRAPPER_FOUND=0
for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do for wrapsource in "/usr/local/share/python/virtualenvwrapper_lazy.sh" "/etc/bash_completion.d/virtualenvwrapper"; do
if [[ -e $wrapsource ]] ; then if [[ -e $wrapsource ]] ; then
WRAPPER_FOUND=1 WRAPPER_FOUND=1
source $wrapsource source $wrapsource