b44aa61f092de9d7ed699ea098380d9514759ba9
- Author
- Robby Russell <robby@planetargon.com>
- Committer
- Robby Russell <robby@planetargon.com>
- Date
Message
Merge branch 'adispring-master'
Diff
1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
2index 3f9ec2c01bd6456b0f12be9dbbb6651ffd1d6f28..0deee9fa2b9a468c6940e4267d2e752daa5411c6 100644
3--- a/plugins/git/git.plugin.zsh
4+++ b/plugins/git/git.plugin.zsh
5@@ -147,9 +147,10 @@ alias ggpush='git push origin $(git_current_branch)'
6 compdef _git ggpush=git-checkout
7
8 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
9-
10 alias gpsup='git push --set-upstream origin $(git_current_branch)'
11
12+alias gh='git help'
13+
14 alias gignore='git update-index --assume-unchanged'
15 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
16 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'