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

Compare commits

base: mirrors:379fe0fe131cff7a480f7975b32b0ea6fc7c2370
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0
...
compare: mirrors:45571bfa03934359a49f7043cbcf50abccdf448c
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0

2 Commits
379fe0fe13 ... 45571bfa03

Author SHA1 Message Date
Carlo Sala
45571bfa03
fix(git): gpristine requires two --force flags 
Fixes #11483
 2023-02-08 11:35:48 +01:00
Carlo Sala
87f1941d27
docs(git): remove duplicated line 2023-02-07 16:17:07 +01:00
2 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
plugins/git/README.md
View File

@ -120,7 +120,6 @@ plugins=(... git)
| gma | git merge --abort | | gma | git merge --abort |
| gp | git push | | gp | git push |
| gpd | git push --dry-run | | gpd | git push --dry-run |
| gpf | git push --force-with-lease |
| gpf | git push --force-with-lease --force-if-includes (git version >= 2.30) | | gpf | git push --force-with-lease --force-if-includes (git version >= 2.30) |
| gpf | git push --force-with-lease (git version < 2.30) | | gpf | git push --force-with-lease (git version < 2.30) |
| gpf! | git push --force | | gpf! | git push --force |

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

@ -104,7 +104,7 @@ compdef _git gccd=git-clone
alias gcl='git clone --recurse-submodules' alias gcl='git clone --recurse-submodules'
alias gclean='git clean --interactive -d' alias gclean='git clean --interactive -d'
alias gpristine='git reset --hard && git clean --force -dx' alias gpristine='git reset --hard && git clean --force -dfx'
alias gcm='git checkout $(git_main_branch)' alias gcm='git checkout $(git_main_branch)'
alias gcd='git checkout $(git_develop_branch)' alias gcd='git checkout $(git_develop_branch)'
alias gcmsg='git commit --message' alias gcmsg='git commit --message'