mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-11-14 06:31:12 +00:00
e4ded4e6ff
In detail: gup - now completes with remotes like git fetch would gdv - got git diff completions gc/gca - now zsh will suggest files in staging area gba - suggestions as for git branch
54 lines
1.4 KiB
Bash
54 lines
1.4 KiB
Bash
# Aliases
|
|
alias g='git'
|
|
compdef g=git
|
|
alias gst='git status'
|
|
compdef _git gst=git-status
|
|
alias gl='git pull'
|
|
compdef _git gl=git-pull
|
|
alias gup='git fetch && git rebase'
|
|
compdef _git gup=git-fetch
|
|
alias gp='git push'
|
|
compdef _git gp=git-push
|
|
alias gd='git diff | mate'
|
|
# WTF is mate??
|
|
compdef _git gd=git-diff
|
|
alias gdv='git diff -w "$@" | vim -R -'
|
|
compdef _git gdv=git-diff
|
|
alias gc='git commit -v'
|
|
compdef _git gc=git-commit
|
|
alias gca='git commit -v -a'
|
|
compdef _git gca=git-commit
|
|
alias gco='git checkout'
|
|
compdef _git gco=git-checkout
|
|
alias gb='git branch'
|
|
compdef _git gb=git-branch
|
|
alias gba='git branch -a'
|
|
compdef _git gba=git-branch
|
|
alias gcount='git shortlog -sn'
|
|
compdef gcount=git
|
|
alias gcp='git cherry-pick'
|
|
compdef _git gcp=git-cherry-pick
|
|
alias glg='git log --stat --max-count=5'
|
|
compdef _git glg=git-log
|
|
|
|
# Git and svn mix
|
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
|
compdef git-svn-dcommit-push=git
|
|
|
|
#
|
|
# Will return the current branch name
|
|
# Usage example: git pull origin $(current_branch)
|
|
#
|
|
function current_branch() {
|
|
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
|
echo ${ref#refs/heads/}
|
|
}
|
|
|
|
# these aliases take advantage of the previous function
|
|
alias ggpull='git pull origin $(current_branch)'
|
|
compdef ggpull=git
|
|
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
|