dolysis
/
ohmyzsh
3
0
Fork 0
Code Issues Pull Requests Releases Activity

#5130 resolving conflict in git plugin for gh

This commit is contained in:
Robby Russell 2016-08-14 17:39:27 -07:00
parent 1e9084c3c7 5fa4d9d760
commit b96a5877aa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,9 +147,10 @@ alias ggpush='git push origin $(git_current_branch)'
compdef _git ggpush=git-checkout compdef _git ggpush=git-checkout
alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)' alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
alias gpsup='git push --set-upstream 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 gignore='git update-index --assume-unchanged'
alias gignored='git ls-files -v | grep "^[[:lower:]]"' alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'