Skip to content

O
oh-my-zsh
Commit b96a5877 authored by Robby Russell's avatar Robby Russell
Browse files
Options

#5130 resolving conflict in git plugin for gh

parents 1e9084c3 5fa4d9d7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
plugins/git/git.plugin.zsh
View file @ b96a5877
...@@ -147,9 +147,10 @@ alias ggpush='git push origin $(git_current_branch)' ...@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment