1
0
Fork 0

Putting Git related aliases into git.zsh to have them in context.

pull/1/merge
Martin Klepsch 15 years ago committed by Robby Russell
parent 90627d3d1c
commit f9509f365b

@ -25,21 +25,6 @@ alias ss='sudo su -'
#alias g='grep -in' #alias g='grep -in'
# Git related
alias g='git'
alias gst='git status'
alias gl='git pull'
alias gup='git fetch && git rebase'
alias gp='git push'
alias gd='git diff | mate'
alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'
# Show history # Show history
alias history='fc -l 1' alias history='fc -l 1'
@ -65,4 +50,4 @@ alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Ra
alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
# Editor Ruby file in TextMate # Editor Ruby file in TextMate
alias mr='mate CHANGELOG app config db lib public script spec test' alias mr='mate CHANGELOG app config db lib public script spec test'

@ -20,3 +20,18 @@ function current_branch() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo ${ref#refs/heads/} echo ${ref#refs/heads/}
} }
# Aliases
alias g='git'
alias gst='git status'
alias gl='git pull'
alias gup='git fetch && git rebase'
alias gp='git push'
alias gd='git diff | mate'
alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'

Loading…
Cancel
Save