7a9cc198196cb0c935afe96e1de249c3a05ad413

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

Message

Merge branch 'git' of https://github.com/papercavalier/oh-my-zsh into papercavalier-git

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index d317d179d8ec7bce0ecf600ec237d5c754f47215..71a62819bbd5decbd8de84a83f14ee98fbc56925 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -8,6 +8,7 @@ alias gd='git diff | mate'
 6 alias gdv='git diff -w "$@" | vim -R -'
 7 alias gc='git commit -v'
 8 alias gca='git commit -v -a'
 9+alias gco='git checkout'
10 alias gb='git branch'
11 alias gba='git branch -a'
12 alias gcount='git shortlog -sn'
13@@ -26,7 +27,7 @@ function current_branch() {
14   echo ${ref#refs/heads/}
15 }
16 
17-# these aliases take advangate of the previous function
18+# these aliases take advantage of the previous function
19 alias ggpull='git pull origin $(current_branch)'
20 alias ggpush='git push origin $(current_branch)'
21-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
22+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'