adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4058 from ncanceill/plugin-git

Browse Source 
[Hotfix] Git plugin
This commit is contained in:
Robby Russell 2015-06-17 14:13:15 -07:00
commit 599831b85a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/git/git.plugin.zsh
View File

@ -101,11 +101,15 @@ git push --force origin "${b:=$1}"
}
compdef _git ggf=git-checkout
ggl() {
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
git pull origin "${*}"
else
[[ "$#" == 0 ]] && local b="$(current_branch)"
git pull origin "${b:=$1}" "${*[2,-1]}"
git pull origin "${b:=$1}"
fi
}
compdef _git ggl=git-checkout
alias ggpull='ggl'
alias ggpull='git pull origin $(current_branch)'
compdef _git ggpull=git-checkout
ggp() {
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
@ -116,7 +120,7 @@ git push origin "${b:=$1}"
fi
}
compdef _git ggp=git-checkout
alias ggpush='ggp'
alias ggpush='git push origin $(current_branch)'
compdef _git ggpush=git-checkout
ggpnp() {
if [[ "$#" == 0 ]]; then