Skip to content

O
oh-my-zsh
Commit 72adfb6c authored by Robby Russell's avatar Robby Russell
Browse files
Options

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

added git merge as gm
parents 57f04b92 c1c7b0e4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
plugins/git/git.plugin.zsh
View file @ 72adfb6c
...@@ -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