Skip to content

Commit

Permalink
ohmyzsh#5130 resolving conflict in git plugin for gh
Browse files Browse the repository at this point in the history
  • Loading branch information
robbyrussell committed Aug 15, 2016
2 parents 2a271c5 + ab872e4 commit e2a6a9c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion plugins/git/git.plugin.zsh
Expand Up @@ -147,9 +147,10 @@ alias ggpush='git push origin $(git_current_branch)'
compdef _git ggpush=git-checkout

alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'

alias gpsup='git push --set-upstream origin $(git_current_branch)'

alias gh='git help'

alias gignore='git update-index --assume-unchanged'
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
Expand Down

0 comments on commit e2a6a9c

Please sign in to comment.