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

Merge branch 'stibbons_fix_git_aliases'

Browse source 
Conflicts:
	plugins/git/git.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-07-15 15:13:45 +02:00
commit 4f70c3670a
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ alias gpr='git pull --rebase'
compdef _git gpr=git-pull
alias gp='git push'
compdef _git gp=git-push
compdef _git gd=git-diff
alias gf='git fetch --all'
compdef _git gf='git-fetch'
alias gfa='git fetch --all'
@ -67,7 +68,7 @@ alias gcl='git config --list'
compdef _git gcl=git-config
alias gcp='git cherry-pick'
compdef _git gcp=git-cherry-pick
alias glg='git log --stat --color'
alias glg='git log --stat --max-count=5 --color'
compdef _git glg=git-log
alias glgp='git log --stat --color -p'
compdef _git glgp=git-log
@ -87,9 +88,10 @@ alias grh='git reset HEAD'
compdef _git grh=git-reset
alias grhh='git reset HEAD --hard'
compdef _git grhh=git-reset
compdef _git gclean=git-reset
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
compdef _git gwc=git-whatchanged
alias gf='git ls-files | grep'
compdef _git gwc=git-whatchanged
alias gls='git ls-files | grep'
compdef _git gls=git-ls-files
alias gpoat='git push origin --all && git push origin --tags'
@ -121,7 +123,10 @@ alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
compdef git-svn-dcommit-push=git
alias gsr='git svn rebase'
compdef _git gsr='git-svn'
alias gsd='git svn dcommit'
compdef _git gsd='git-svn'
#
# Will return the current branch name
# Usage example: git pull origin $(current_branch)