diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index bf7cd1ac9..1b2f0a1ff 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -15,7 +15,6 @@ alias gup='git pull --rebase' compdef _git gup=git-fetch alias gp='git push' compdef _git gp=git-push -alias gd='git diff' gdv() { git diff -w "$@" | view - } compdef _git gdv=git-diff alias gdt='git difftool' @@ -44,10 +43,14 @@ alias grset='git remote set-url' compdef _git grset=git-remote alias grup='git remote update' compdef _git grset=git-remote +alias grb='git rebase' +compdef _git grb=git-rebase alias grbi='git rebase -i' compdef _git grbi=git-rebase alias grbc='git rebase --continue' compdef _git grbc=git-rebase +alias grbs='git rebase --skip' +compdef _git grbs=git-rebase alias grba='git rebase --abort' compdef _git grba=git-rebase alias gb='git branch' @@ -174,6 +177,3 @@ alias gignore='git update-index --assume-unchanged' alias gunignore='git update-index --no-assume-unchanged' # list temporarily ignored files alias gignored='git ls-files -v | grep "^[[:lower:]]"' - - -