Skip to content

O
oh-my-zsh
Unverified Commit 5a4159cd authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

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
parent 7336ebcd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
plugins/git/README.md
View file @ 5a4159cd
...@@ -108,8 +108,8 @@ plugins=(... git) ...@@ -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 |
......
plugins/git/git.plugin.zsh
View file @ 5a4159cd
...@@ -221,8 +221,8 @@ alias glp="_git_log_prettily" ...@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment