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

Fix in git plugin

Browse source 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2013-12-09 11:19:06 +01:00
commit 4470dc59ec
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,16 +17,10 @@ alias gd='git diff --color'
compdef _git gd=git-diff compdef _git gd=git-diff
gdv() { git diff -w "$@" | view - } gdv() { git diff -w "$@" | view - }
compdef _git gdv=git-diff compdef _git gdv=git-diff
alias gdc='git diff --cached'
compdef _git gdc=git-diff
# Git Pull (gp) # Git Pull (gp)
alias gp='git pull' alias gp='git pull'
compdef _git gl=git-pull compdef _git gl=git-pull
alias gch='git fetch'
compdef _git gch=git-fetch
alias gup='git pull --rebase'
compdef _git gup=git-pull
alias gpr='git pull --rebase' alias gpr='git pull --rebase'
compdef _git gpr=git-pull compdef _git gpr=git-pull
@ -62,7 +56,6 @@ compdef _git gco=git-checkout
alias gcom='git checkout master' alias gcom='git checkout master'
compdef _git gcom=git-checkout compdef _git gcom=git-checkout
# Git Remote (gre) # Git Remote (gre)
alias gre='git remote' alias gre='git remote'
compdef _git gre=git-remote compdef _git gre=git-remote
@ -89,7 +82,7 @@ compdef _git grs=git-rebase
alias grm='git rebase master' alias grm='git rebase master'
compdef _git grm=git-rebase compdef _git grm=git-rebase
# Git Branch (bb) # Git Branch (gb)
alias gb='git branch' alias gb='git branch'
compdef _git gb=git-branch compdef _git gb=git-branch
alias gba='git branch -a' alias gba='git branch -a'
@ -109,12 +102,18 @@ compdef _git glgga=git-log
alias glo='git log --oneline' alias glo='git log --oneline'
compdef _git glo=git-log compdef _git glo=git-log
# Git Reset (grh) # Git Reset Head (grh)
alias grh='git reset HEAD' alias grh='git reset HEAD'
compdef _git grh=git-reset compdef _git grh=git-reset
alias grhh='git reset HEAD --hard' alias grhh='git reset HEAD --hard'
compdef _git grhh=git-reset compdef _git grhh=git-reset
# Git merge (gm)
alias gm='git merge'
compdef _git gm=git-merge
alias gmum='git merge upstream/master'
compdef _git gmum=git-merge
# Other # Other
alias gcount='git shortlog -sn' alias gcount='git shortlog -sn'
compdef gcount=git compdef gcount=git
@ -126,8 +125,6 @@ alias gss='git status -s'
compdef _git gss=git-status compdef _git gss=git-status
alias ga='git add' alias ga='git add'
compdef _git ga=git-add compdef _git ga=git-add
alias gm='git merge'
compdef _git gm=git-merge
# See what changed in the current commit # See what changed in the current commit
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
@ -145,16 +142,16 @@ alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
compdef _git gmtvim=git-mergetool compdef _git gmtvim=git-mergetool
# Git stash (gsta) # Git stash (gsta)
alias gstas='git stash show --text'
compdef _git gsts='git-stash'
alias gstap='git stash pop'
compdef _git gstp='git-stash'
alias gstaa='git stash apply'
compdef _git gstz='git-stash'
alias gsta='git stash' alias gsta='git stash'
compdef _git gst='git-stash' compdef _git gsta='git-stash'
alias gstas='git stash show --text'
compdef _git gstas='git-stash'
alias gstap='git stash pop'
compdef _git gstap='git-stash'
alias gstaa='git stash apply'
compdef _git gstaa='git-stash'
alias gstad='git stash drop' alias gstad='git stash drop'
compdef _git gstd='git-stash' compdef _git gstad='git-stash'
# Git Gui (gg) # Git Gui (gg)
alias gg='git gui citool' alias gg='git gui citool'
@ -172,7 +169,7 @@ compdef _git gitk='gitk'
# Clean # Clean
# Remove all .orig, .BASE.*, .REMOTE.*, .LOCAL.* files # Remove all .orig, .BASE.*, .REMOTE.*, .LOCAL.* files
alias gclean='find . -name "*.orig" -or -name "*.REMOTE.*" -or -name "*.LOCAL.*" -or -name "*.BASE.*" -delete' alias gclean="find . -name '*.orig' -or -name '*.REMOTE.*' -or -name '*.LOCAL.*' -or -name '*.BASE.*' -delete"
# Edit global Git configuration files # Edit global Git configuration files
alias gitconfig="vim ~/.gitconfig" alias gitconfig="vim ~/.gitconfig"