Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kirill Panshin 2012-07-17 12:00:26 +04:00
commit 7d82fe7c76
32 changed files with 318 additions and 22 deletions

View file

@ -60,10 +60,16 @@ function current_branch() {
echo ${ref#refs/heads/}
}
function current_repository() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo $(git remote -v | cut -d':' -f 2)
}
# these aliases take advantage of the previous function
alias ggpull='git pull origin $(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)'
compdef ggpnp=git
compdef ggpnp=git