dolysis/ohmyzsh
3
0
Fork 0
Code Issues Pull requests Releases Activity

Resolving conflict in merge of #1313

Browse source
This commit is contained in:
Robby Russell 2012-12-04 06:35:59 -08:00
parent 51e05b7579 28d28ee6f6
commit 868a5138f6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ alias glg='git log --stat --max-count=5'
compdef _git glg=git-log compdef _git glg=git-log
alias glgg='git log --graph --max-count=5' alias glgg='git log --graph --max-count=5'
compdef _git glgg=git-log compdef _git glgg=git-log
alias glgga='git log --graph --decorate --all' alias glgga='git log --graph --decorate --all'
compdef _git glgga=git-log compdef _git glgga=git-log
alias gss='git status -s' alias gss='git status -s'
compdef _git gss=git-status compdef _git gss=git-status
@ -42,13 +42,12 @@ alias grh='git reset HEAD'
alias grhh='git reset HEAD --hard' alias grhh='git reset HEAD --hard'
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
alias gf='git ls-files | grep' alias gf='git ls-files | grep'
alias gpoat='git push origin --all && git push origin --tags'
# Will cd into the top of the current repository # Will cd into the top of the current repository
# or submodule. # or submodule.
alias grt='cd $(git rev-parse --show-toplevel || echo ".")' alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
# Git and svn mix # Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
compdef git-svn-dcommit-push=git compdef git-svn-dcommit-push=git