diff options
| author | Dan Shearmur <dan.shearmur@semantico.com> | 2011-09-26 14:44:42 +0100 |
|---|---|---|
| committer | Dan Shearmur <dan.shearmur@semantico.com> | 2011-09-26 14:44:42 +0100 |
| commit | c1c7b0e4af8a33c25118679f075f63a3b67b14f4 (patch) | |
| tree | 5088aa03236bcc8b688364b227089d0296a6f18e /plugins | |
| parent | 762b55bb2bc0452ce3f5f2f21bc22b61936ef704 (diff) | |
| download | zsh-c1c7b0e4af8a33c25118679f075f63a3b67b14f4.tar.gz zsh-c1c7b0e4af8a33c25118679f075f63a3b67b14f4.tar.bz2 zsh-c1c7b0e4af8a33c25118679f075f63a3b67b14f4.zip | |
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' |