diff options
| author | Robby Russell <robby@planetargon.com> | 2016-08-14 17:39:27 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2016-08-14 17:39:27 -0700 |
| commit | b96a5877aab9d03fd3d91f03862cfc98bfe18dde (patch) | |
| tree | e879e0b8562dc08efb31f9dcf55f7b9726b8e8d8 | |
| parent | 1e9084c3c77b5b9e95c2d75cb08f88078853bd6d (diff) | |
| parent | 5fa4d9d7606057ccb8e39a452db9a656b5f3caed (diff) | |
| download | zsh-b96a5877aab9d03fd3d91f03862cfc98bfe18dde.tar.gz zsh-b96a5877aab9d03fd3d91f03862cfc98bfe18dde.tar.bz2 zsh-b96a5877aab9d03fd3d91f03862cfc98bfe18dde.zip | |
#5130 resolving conflict in git plugin for gh
| -rw-r--r-- | plugins/git/git.plugin.zsh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 3f9ec2c01..0deee9fa2 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -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' |