holm/ohmyzsh
1
1
Fork 0
forked from extern/ohmyzsh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(git)!: rename git mergetool aliases to gmtl* (#9154)

Browse Source 
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
This commit is contained in:
Marc Cornellà 2021-09-06 13:25:35 +02:00
parent 7336ebcd8f
commit 5a4159cd29
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/git/README.md
View File

@ -108,8 +108,8 @@ plugins=(... git)
| glp | git log --pretty=\<format\> | | glp | git log --pretty=\<format\> |
| gm | git merge | | gm | git merge |
| gmom | git merge origin/$(git_main_branch) | | gmom | git merge origin/$(git_main_branch) |
| gmt | git mergetool --no-prompt | | gmtl | git mergetool --no-prompt |
| gmtvim | git mergetool --no-prompt --tool=vimdiff | | gmtlvim | git mergetool --no-prompt --tool=vimdiff |
| gmum | git merge upstream/$(git_main_branch) | | gmum | git merge upstream/$(git_main_branch) |
| gma | git merge --abort | | gma | git merge --abort |
| gp | git push | | gp | git push |

4
plugins/git/git.plugin.zsh
View File

@ -221,8 +221,8 @@ alias glp="_git_log_prettily"
alias gm='git merge' alias gm='git merge'
alias gmom='git merge origin/$(git_main_branch)' alias gmom='git merge origin/$(git_main_branch)'
alias gmt='git mergetool --no-prompt' alias gmtl='git mergetool --no-prompt'
alias gmtvim='git mergetool --no-prompt --tool=vimdiff' alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
alias gmum='git merge upstream/$(git_main_branch)' alias gmum='git merge upstream/$(git_main_branch)'
alias gma='git merge --abort' alias gma='git merge --abort'