`72adfb6cc7bae9ec449f2654038528c359a3c367`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2011-10-10 12:35 UTC

Message

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

added git merge as gm

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 4fcf9425d408a7a40996f8ff8d5e189a155044af..183c56c1c6fef531e3c0b300debfa745774365fd 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -33,6 +33,8 @@ alias gss='git status -s'
 6 compdef _git gss=git-status
 7 alias ga='git add'
 8 compdef _git ga=git-add
 9+alias gm='git merge'
10+compdef _git gm=git-merge
11 
12 # Git and svn mix
13 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'