Merge branch 'git' of https://github.com/papercavalier/oh-my-zsh into papercavalier-git

This commit is contained in:
Robby Russell 2011-01-08 11:33:14 -08:00
commit 7a9cc19819
1 changed files with 3 additions and 2 deletions

View File

@ -8,6 +8,7 @@ alias gd='git diff | mate'
alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gco='git checkout'
alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
@ -26,7 +27,7 @@ function current_branch() {
echo ${ref#refs/heads/}
}
# these aliases take advangate of the previous function
# these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)'
alias ggpush='git push origin $(current_branch)'
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'