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

Merge cf1799dc0e into 7004ac9ec4

Browse source
This commit is contained in:
J. Randall Hunt 2012-12-02 12:25:16 -08:00
commit 816347730b
3 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,9 +69,9 @@ function current_repository() {
}
# 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
alias ggpush='git push origin $(current_branch)'
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

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

@ -1,5 +1,8 @@
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/bin/virtualenvwrapper_lazy.sh" \
"/usr/local/bin/virtualenvwrapper_lazy.sh" \
"/usr/local/share/python/virtualenvwrapper_lazy.sh" \
"/etc/bash_completion.d/virtualenvwrapper"; do
if [[ -e $wrapsource ]] ; then
WRAPPER_FOUND=1
source $wrapsource