diff --git a/zsh/.zshrc b/zsh/.zshrc index 3869048..c4ee50f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -146,6 +146,7 @@ alias gi="git init" alias gcl="git clone" alias gd="git diff --output-indicator-new=' ' --output-indicator-old=' '" alias gl="git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an %ar%C(auto) %D%n%s%n'" +alias gm="git merge" # Alias functions vif() {