Merge pull request #631 from danshearmur/git-merge-alias

added git merge as gm
This commit is contained in:
Robby Russell 2011-10-10 05:35:16 -07:00
commit 72adfb6cc7

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'