linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

resolved another conflict with upstream

Browse source
This commit is contained in:
MatToufoutu 2010-12-22 16:26:44 +01:00
commit 612dc5abfb
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,10 +13,7 @@ alias gb='git branch'
alias gba='git branch -a' alias gba='git branch -a'
alias gcount='git shortlog -sn' alias gcount='git shortlog -sn'
alias gcp='git cherry-pick' alias gcp='git cherry-pick'
<<<<<<< HEAD:plugins/git.plugin.zsh
=======
alias glg='git log --stat --max-count=5' alias glg='git log --stat --max-count=5'
>>>>>>> upstream/master:plugins/git/git.plugin.zsh
# 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'