Alias update

2013-07-25 12:54:40 -04:00
parent ee6c2ed3a6
commit d9c8451aeb
2 changed files with 2 additions and 1 deletions
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -84,6 +84,7 @@ alias gh="source ~/.githelpers && show_git_head"
 alias gl='gll -25'
 alias gll="source ~/.githelpers && pretty_git_log"
 alias gla='gll --all'
+alias gm='git merge'
 alias gmff='git merge --ff-only'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'