mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-26 21:51:05 +01:00
Merge pull request #631 from danshearmur/git-merge-alias
added git merge as gm
This commit is contained in:
commit
72adfb6cc7
1 changed files with 2 additions and 0 deletions
|
@ -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'
|
||||||
|
|
Loading…
Reference in a new issue