Resolving conflict in merge of #1313

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