linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-27 03:05:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bfc406d18d into df5b09e20b

Browse source
This commit is contained in:
Marten Lienen 2014-11-07 16:03:18 +00:00
commit 6ffa84c76a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/git/git.plugin.zsh
View file

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