mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-17 23:57:52 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:159fa377d9588e4731a43da8e2a6370c8195c318
Branches Tags
mirrors:master
mirrors:docs-add-AI-disclosure-to-contributing
...
compare: mirrors:b2a4881a137a3b4160ebe8c9da42dcb20b14a6ce
Branches Tags
mirrors:docs-add-AI-disclosure-to-contributing
mirrors:master

3 Commits
159fa377d9 ... b2a4881a13

Author SHA1 Message Date
Haltarys
b2a4881a13
Merge 0ccd809f6e into f84341c574 2025-12-11 15:19:31 +01:00
tDwtp
f84341c574
fix(git): git_status_prompt should respect spaces in prefixes (#13478) 2025-12-11 15:05:23 +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
3 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
lib/git.zsh
View File

@ -117,7 +117,7 @@ function _omz_git_prompt_status() {
fi
# For each status prefix, do a regex comparison
for status_prefix in ${(k)prefix_constant_map}; do
for status_prefix in "${(@k)prefix_constant_map}"; do
local status_constant="${prefix_constant_map[$status_prefix]}"
local status_regex=$'(^|\n)'"$status_prefix"

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"