diff options
| -rw-r--r-- | plugins/git/README.md | 4 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md index 13571c821..64c507345 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -108,8 +108,8 @@ plugins=(... git) | glp | git log --pretty=\<format\> | | gm | git merge | | gmom | git merge origin/$(git_main_branch) | -| gmt | git mergetool --no-prompt | -| gmtvim | git mergetool --no-prompt --tool=vimdiff | +| gmtl | git mergetool --no-prompt | +| gmtlvim | git mergetool --no-prompt --tool=vimdiff | | gmum | git merge upstream/$(git_main_branch) | | gma | git merge --abort | | gp | git push | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 03769ed0f..d030d2801 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -221,8 +221,8 @@ alias glp="_git_log_prettily" alias gm='git merge' alias gmom='git merge origin/$(git_main_branch)' -alias gmt='git mergetool --no-prompt' -alias gmtvim='git mergetool --no-prompt --tool=vimdiff' +alias gmtl='git mergetool --no-prompt' +alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' alias gmum='git merge upstream/$(git_main_branch)' alias gma='git merge --abort' |