added git merge as gm

This commit is contained in:
Dan Shearmur 2011-09-26 14:44:42 +01:00
parent 762b55bb2b
commit c1c7b0e4af

View file

@ -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'