868a5138f619f4d35588ba01b8b3340a4086b4ea

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Resolving conflict in merge of #1313

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 6b7bd374c7a6ee1922d260efa9ea5f9558517dba..35639096ef265962140e68b5fcd24931d05360e7 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -30,7 +30,7 @@ alias glg='git log --stat --max-count=5'
 6 compdef _git glg=git-log
 7 alias glgg='git log --graph --max-count=5'
 8 compdef _git glgg=git-log
 9-alias glgga='git log --graph --decorate --all' 
10+alias glgga='git log --graph --decorate --all'
11 compdef _git glgga=git-log
12 alias gss='git status -s'
13 compdef _git gss=git-status
14@@ -42,13 +42,12 @@ alias grh='git reset HEAD'
15 alias grhh='git reset HEAD --hard'
16 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
17 alias gf='git ls-files | grep'
18+alias gpoat='git push origin --all && git push origin --tags'
19 
20 # Will cd into the top of the current repository
21 # or submodule.
22 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
23 
24-
25-
26 # Git and svn mix
27 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
28 compdef git-svn-dcommit-push=git