linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-12 01:52:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0ccd809f6e into f84341c574

Browse source
This commit is contained in:
Haltarys 2025-12-11 15:19:31 +01:00 • committed by GitHub
commit b2a4881a13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/git/README.md
View file

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