diff options
| author | Robby Russell <robby@planetargon.com> | 2011-10-10 05:35:16 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-10-10 05:35:16 -0700 |
| commit | 72adfb6cc7bae9ec449f2654038528c359a3c367 (patch) | |
| tree | a929575b658f861aa742211c42471b8edf068637 /plugins | |
| parent | 57f04b921ea1c12a0a283331778848cd4011bf21 (diff) | |
| parent | c1c7b0e4af8a33c25118679f075f63a3b67b14f4 (diff) | |
| download | zsh-72adfb6cc7bae9ec449f2654038528c359a3c367.tar.gz zsh-72adfb6cc7bae9ec449f2654038528c359a3c367.tar.bz2 zsh-72adfb6cc7bae9ec449f2654038528c359a3c367.zip | |
Merge pull request #631 from danshearmur/git-merge-alias
added git merge as gm
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 4fcf9425d..183c56c1c 100644 --- 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' |