mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 23:30:08 +00:00
added git merge as gm
This commit is contained in:
parent
762b55bb2b
commit
c1c7b0e4af
1 changed files with 2 additions and 0 deletions
|
@ -33,6 +33,8 @@ alias gss='git status -s'
|
||||||
compdef _git gss=git-status
|
compdef _git gss=git-status
|
||||||
alias ga='git add'
|
alias ga='git add'
|
||||||
compdef _git ga=git-add
|
compdef _git ga=git-add
|
||||||
|
alias gm='git merge'
|
||||||
|
compdef _git gm=git-merge
|
||||||
|
|
||||||
# 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'
|
||||||
|
|
Loading…
Reference in a new issue