summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2011-01-08 11:33:14 -0800
committerRobby Russell <robby@planetargon.com>2011-01-08 11:33:14 -0800
commit7a9cc198196cb0c935afe96e1de249c3a05ad413 (patch)
tree2c3bf94420693c0f66f0bff41da0ef6b982b2c3f
parent31bfb61290439ee995ce1f789a270d4eac6cccde (diff)
parent1a8ceef514bc86f882adce1834bfab168afcb4d1 (diff)
downloadzsh-7a9cc198196cb0c935afe96e1de249c3a05ad413.tar.gz
zsh-7a9cc198196cb0c935afe96e1de249c3a05ad413.tar.bz2
zsh-7a9cc198196cb0c935afe96e1de249c3a05ad413.zip
Merge branch 'git' of https://github.com/papercavalier/oh-my-zsh into papercavalier-git
-rw-r--r--plugins/git/git.plugin.zsh5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d317d179d..71a62819b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -8,6 +8,7 @@ alias gd='git diff | mate'
alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v'
alias gca='git commit -v -a'
+alias gco='git checkout'
alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
@@ -26,7 +27,7 @@ function current_branch() {
echo ${ref#refs/heads/}
}
-# these aliases take advangate of the previous function
+# these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)'
alias ggpush='git push origin $(current_branch)'
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' \ No newline at end of file
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'