Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

This commit is contained in:
Joey Lomanto 2013-05-10 09:22:57 -04:00
commit abb35f97fa
59 changed files with 1744 additions and 231 deletions

View file

@ -3,6 +3,8 @@ alias g='git'
compdef g=git
alias gst='git status'
compdef _git gst=git-status
alias gd='git diff'
compdef _git gd=git-diff
alias gl='git pull'
compdef _git gl=git-pull
alias gup='git pull --rebase'
@ -52,6 +54,8 @@ alias gplg="git log --no-merges --graph --pretty=format:'%C()%h%Creset - %C(gree
compdef _git gplg=git-log
alias glgga='git log --graph --decorate --all'
compdef _git glgga=git-log
alias glo='git log --oneline'
compdef _git glo=git-log
alias gss='git status -s'
compdef _git gss=git-status
alias ga='git add'
@ -97,3 +101,12 @@ alias ggpush='git push origin $(current_branch)'
compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git
# Pretty log messages
function _git_log_prettily(){
if ! [ -z $1 ]; then
git log --pretty=$1
fi
}
alias glp="_git_log_prettily"
compdef _git glp=git-log