diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-04 06:35:59 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-04 06:35:59 -0800 |
| commit | 868a5138f619f4d35588ba01b8b3340a4086b4ea (patch) | |
| tree | 9b1ee65709efb3336412290e900d1860d273256a | |
| parent | 51e05b7579a26266a0ed26398ab9eb5071800cd8 (diff) | |
| parent | 28d28ee6f6128b3194ac6e28839aabb9a9018c4e (diff) | |
| download | zsh-868a5138f619f4d35588ba01b8b3340a4086b4ea.tar.gz zsh-868a5138f619f4d35588ba01b8b3340a4086b4ea.tar.bz2 zsh-868a5138f619f4d35588ba01b8b3340a4086b4ea.zip | |
Resolving conflict in merge of #1313
| -rw-r--r-- | plugins/git/git.plugin.zsh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 6b7bd374c..35639096e 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -30,7 +30,7 @@ alias glg='git log --stat --max-count=5' compdef _git glg=git-log alias glgg='git log --graph --max-count=5' compdef _git glgg=git-log -alias glgga='git log --graph --decorate --all' +alias glgga='git log --graph --decorate --all' compdef _git glgga=git-log alias gss='git status -s' compdef _git gss=git-status @@ -42,13 +42,12 @@ alias grh='git reset HEAD' alias grhh='git reset HEAD --hard' alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' alias gf='git ls-files | grep' +alias gpoat='git push origin --all && git push origin --tags' # Will cd into the top of the current repository # or submodule. alias grt='cd $(git rev-parse --show-toplevel || echo ".")' - - # Git and svn mix alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' compdef git-svn-dcommit-push=git |