mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-08 21:28:24 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:e3b58b9f0206d3918417eb1bf2e4dfd83cd944c3
Branches Tags
mirrors:master
...
compare: mirrors:fffb16739c9d7b56942217c143578fdd1f1dcfef
Branches Tags
mirrors:master

2 Commits
e3b58b9f02 ... fffb16739c

Author SHA1 Message Date
Haltarys
fffb16739c
Merge 0ccd809f6e into ddec79ad43 2025-12-07 18:46:14 +01:00
Haltarys
0ccd809f6e fix(plugins/git): change alias gm to gme (conflict with GraphicsMagick) 
`gm` is the name of the GraphicsMagick (http://www.graphicsmagick.org/index.html) command line tool, which conflicts with the `gm` alias in the git plugin. This change renames the alias to `gme` to avoid the conflict.

style(plugins/git): realign column in Readme

fix(plugins/git): realign column in Readme
 2025-08-20 20:27:43 +02:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
plugins/git/README.md
View File

@ -112,7 +112,7 @@ plugins=(... git)
| `glgp` | `git log --stat --patch` |
| `gignored` | `git ls-files -v \| grep "^[[:lower:]]"` |
| `gfg` | `git ls-files \| grep` |
| `gm` | `git merge` |
| `gme` | `git merge` |
| `gma` | `git merge --abort` |
| `gmc` | `git merge --continue` |
| `gms` | `git merge --squash` |

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

@ -263,7 +263,7 @@ alias glg='git log --stat'
alias glgp='git log --stat --patch'
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias gfg='git ls-files | grep'
alias gm='git merge'
alias gme='git merge'
alias gma='git merge --abort'
alias gmc='git merge --continue'
alias gms="git merge --squash"