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

merge upstream, fix git conflict

Browse source
This commit is contained in:
steeef 2010-10-10 12:27:37 -07:00
commit a023b287e4
8 changed files with 111 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,8 +13,12 @@ alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'
<<<<<<< HEAD
alias gsub='git submodule'
=======
alias glg='git log --stat --max-count=5'
>>>>>>> upstream/master
# Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'