5a4159cd29ab9dfa31e7747dd676f3cf0e19bf81Author Marc Cornellà <hello@mcornella.com> Committer Marc Cornellà <hello@mcornella.com> Date 2021-09-06 11:31 UTC Message fix(git)!: rename `git mergetool` aliases to `gmtl*` (#9154)
BREAKING CHANGE: the `gmt` alias conflicts with the Generic Mapping Tools command.
For that, the `gmt` alias has been renamed to `gmtl`, and `gmtvim` has been renamed to
`gmtlvim` for consistency.
Fixes #9154
Diff 1 diff --git a/plugins/git/README.md b/plugins/git/README.md
2 index 13571c8219248605ef1f6891526ae275fd9eac28..64c507345bd5c3e27c42f8e71c0a4bcb65343716 100644
3 --- a/plugins/git/README.md
4 +++ b/plugins/git/README.md
5 @@ -108,8 +108,8 @@ plugins=(... git)
6 | glp | git log --pretty=\<format\> |
7 | gm | git merge |
8 | gmom | git merge origin/$(git_main_branch) |
9 -| gmt | git mergetool --no-prompt |
10 -| gmtvim | git mergetool --no-prompt --tool=vimdiff |
11 +| gmtl | git mergetool --no-prompt |
12 +| gmtlvim | git mergetool --no-prompt --tool=vimdiff |
13 | gmum | git merge upstream/$(git_main_branch) |
14 | gma | git merge --abort |
15 | gp | git push |
16 diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
17 index 03769ed0f7cc3c2b3bf3c98ff7d31e04007cd68d..d030d280118903989adf0cd973216e35b41e88b5 100644
18 --- a/plugins/git/git.plugin.zsh
19 +++ b/plugins/git/git.plugin.zsh
20 @@ -221,8 +221,8 @@ alias glp="_git_log_prettily"
21
22 alias gm='git merge'
23 alias gmom='git merge origin/$(git_main_branch)'
24 -alias gmt='git mergetool --no-prompt'
25 -alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
26 +alias gmtl='git mergetool --no-prompt'
27 +alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
28 alias gmum='git merge upstream/$(git_main_branch)'
29 alias gma='git merge --abort'
30