From 0ccd809f6e9b033d9bfe379c8df7745b94cd321d Mon Sep 17 00:00:00 2001 From: Haltarys <45515869+Haltarys@users.noreply.github.com> Date: Wed, 20 Aug 2025 19:57:34 +0200 Subject: [PATCH] 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 --- plugins/git/README.md | 4 ++-- plugins/git/git.plugin.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/git/README.md b/plugins/git/README.md index edddc8cd8..1c7049d3e 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -91,7 +91,7 @@ plugins=(... git) | `gdnolock` | `git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock"` | | `gdt` | `git diff-tree --no-commit-id --name-only -r` | | `gf` | `git fetch` | -| `gfa` | `git fetch --all --tags --prune` | +| `gfa` | `git fetch --all --tags --prune` | | `gfo` | `git fetch origin` | | `gg` | `git gui citool` | | `gga` | `git gui citool --amend` | @@ -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` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 335eaa8d0..191aa8b24 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -253,7 +253,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"