Commit 7a9cc198 authored by Robby Russell's avatar Robby Russell
Browse files

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

parents 31bfb612 1a8ceef5
...@@ -8,6 +8,7 @@ alias gd='git diff | mate' ...@@ -8,6 +8,7 @@ alias gd='git diff | mate'
alias gdv='git diff -w "$@" | vim -R -' alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v' alias gc='git commit -v'
alias gca='git commit -v -a' alias gca='git commit -v -a'
alias gco='git checkout'
alias gb='git branch' alias gb='git branch'
alias gba='git branch -a' alias gba='git branch -a'
alias gcount='git shortlog -sn' alias gcount='git shortlog -sn'
...@@ -26,7 +27,7 @@ function current_branch() { ...@@ -26,7 +27,7 @@ function current_branch() {
echo ${ref#refs/heads/} 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 ggpull='git pull origin $(current_branch)'
alias ggpush='git push origin $(current_branch)' alias ggpush='git push origin $(current_branch)'
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment