From: Samir Benmendil Date: Fri, 20 Nov 2015 10:49:58 +0000 (+0000) Subject: zsh: no need for compdef apparently X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/41017a0736d193f54236173222e7e4d476642d04?ds=sidebyside zsh: no need for compdef apparently --- diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh index d487d61..2d1b72e 100644 --- a/zsh/aliases/git.zsh +++ b/zsh/aliases/git.zsh @@ -1,97 +1,79 @@ # Aliases alias g='git' -compdef g=git + alias gst='git status' -compdef _git gst=git-status alias gsts='git status -s' -compdef _git gsts=git-status + alias gl='git pull' -compdef _git gl=git-pull alias gup='git pull --rebase' -compdef _git gup=git-fetch + alias gp='git push' -compdef _git gp=git-push + alias gd='git diff' alias gdc='git diff --cached' + alias gc='git commit -v' -compdef _git gc=git-commit alias gcs='git commit -v --squash' -compdef _git gcs=git-commit alias gcf='git commit -v --fixup' -compdef _git gcf=git-commit alias gca='git commit -v -a' -compdef _git gca=git-commit + alias gco='git checkout' -compdef _git gco=git-checkout alias gcm='git checkout master' + alias gs='git stash save' -compdef _git gs=git-stash alias gsa='git stash apply' -compdef _git gsa=git-stash alias gsp='git stash pop' -compdef _git gsp=git-stash alias gsd='git stash drop' -compdef _git gsd=git-stash alias gsl='git --no-pager stash list' -compdef _git gsl=git-stash alias gss='git stash show --patch' -compdef _git gss=git-stash + alias gr='git remote' -compdef _git gr=git-remote alias grv='git remote -v' -compdef _git grv=git-remote alias grmv='git remote rename' -compdef _git grmv=git-remote alias grrm='git remote remove' -compdef _git grrm=git-remote alias grset='git remote set-url' -compdef _git grset=git-remote alias grup='git remote update' -compdef _git grset=git-remote + alias gb='git branch' -compdef _git gb=git-branch alias gba='git branch -a' -compdef _git gba=git-branch alias gbm='git branch --merged' alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs -n 1 git branch -d' -alias gcount='git shortlog -sn' -compdef gcount=git + alias gcl='git config --list' alias gcp='git cherry-pick' -compdef _git gcp=git-cherry-pick + +alias gcount='git shortlog -sn' alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate' alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' -compdef _git glg=git-log alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' -compdef _git glgl=git-log alias glgg='git log --stat --graph --max-count=20 --decorate' -compdef _git glgg=git-log alias glgga='git log --stat --graph --decorate --all' -compdef _git glgga=git-log + alias ga='git add' -compdef _git ga=git-add + alias gm='git merge' -compdef _git gm=git-merge + alias grh='git reset HEAD' alias grhh='git reset HEAD --hard' + alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' + alias gf='git ls-files | grep' + alias gpoat='git push origin --all && git push origin --tags' -# Will cd into the top of the current repository +# cd into the top of the current repository # or submodule. alias grt='cd $(git rev-parse --show-toplevel || echo ".")' # Git and svn mix alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' -compdef git-svn-dcommit-push=git alias gsr='git svn rebase' alias gsd='git svn dcommit' -# -# Will return the current branch name + +# return the current branch name # Usage example: git pull origin $(current_branch) -# function current_branch() { ref=$(git symbolic-ref HEAD 2> /dev/null) || \ ref=$(git rev-parse --short HEAD 2> /dev/null) || return @@ -106,8 +88,5 @@ function current_repository() { # 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