added git merge as gm

2011-09-26 14:44:42 +01:00 · 2011-09-26 14:44:42 +01:00 · c1c7b0e4af
commit c1c7b0e4af
parent 762b55bb2b
1 changed files with 2 additions and 0 deletions
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@ -33,6 +33,8 @@ alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'
 compdef _git ga=git-add
+alias gm='git merge'
+compdef _git gm=git-merge

 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'