diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 3e871068e..7ca335983 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -63,6 +63,8 @@ alias grhh='git reset HEAD --hard' alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' alias gf='git ls-files | grep' alias gpoat='git push origin --all && git push origin --tags' +alias gmt='git mergetool --no-prompt' +compdef _git gm=git-mergetool alias gg='git gui citool' alias gga='git gui citool --amend'