Commit c1c7b0e4 authored by Dan Shearmur's avatar Dan Shearmur
Browse files

added git merge as gm

parent 762b55bb
...@@ -33,6 +33,8 @@ alias gss='git status -s' ...@@ -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'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment