From 0c51153c9ebeaca60b880ef7316c1ea177942597 Mon Sep 17 00:00:00 2001 From: Randall Hunt Date: Mon, 6 Aug 2012 12:27:25 -0400 Subject: [PATCH] fixed paths for virtualenv --- plugins/git/git.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 71388c53a..49d60d441 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -65,9 +65,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