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 remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/repo/repo.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-06-26 17:24:11 +02:00
commit e646ee6caa
16 changed files with 296 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,12 +49,12 @@ alias grset='git remote set-url'
compdef _git grset=git-remote
alias grup='git remote update'
compdef _git grset=git-remote
alias gri='git rebase -i'
compdef _git grbi=git-rebase
alias gr='git rebase -i'
compdef _git gr=git-rebase
alias grc='git rebase --continue'
compdef _git grbc=git-rebase
compdef _git grc=git-rebase
alias gra='git rebase --abort'
compdef _git grba=git-rebase
compdef _git gra=git-rebase
alias gb='git branch'
compdef _git gb=git-branch
alias gba='git branch -a'
@ -85,6 +85,8 @@ alias grh='git reset HEAD'
compdef _git grh=git-reset
alias grhh='git reset HEAD --hard'
compdef _git grhh=git-reset
alias gclean='git reset --hard && git clean -dfx'
compdef _git gclean=git-reset
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
compdef _git gwc=git-whatchanged
alias gls='git ls-files | grep'
@ -138,6 +140,8 @@ function current_repository() {
# these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)'
compdef ggpull=git
alias ggpur='git pull --rebase origin $(current_branch)'
compdef ggpur=git
alias ggpush='git push origin $(current_branch)'
compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'