mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-18 10:22:00 +00:00
feat(git): add aliases for worktree
(#10079)
This commit is contained in:
parent
4e2317c757
commit
ac0924930d
2 changed files with 14 additions and 3 deletions
|
@ -91,8 +91,8 @@ plugins=(... git)
|
||||||
| gignore | git update-index --assume-unchanged |
|
| gignore | git update-index --assume-unchanged |
|
||||||
| gignored | git ls-files -v \| grep "^[[:lower:]]" |
|
| gignored | git ls-files -v \| grep "^[[:lower:]]" |
|
||||||
| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk |
|
| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk |
|
||||||
| gk | gitk --all --branches &! |
|
| gk | gitk --all --branches &! |
|
||||||
| gke | gitk --all $(git log -g --pretty=%h) &! |
|
| gke | gitk --all $(git log -g --pretty=%h) &! |
|
||||||
| gl | git pull |
|
| gl | git pull |
|
||||||
| glg | git log --stat |
|
| glg | git log --stat |
|
||||||
| glgp | git log --stat -p |
|
| glgp | git log --stat -p |
|
||||||
|
@ -184,7 +184,7 @@ plugins=(... git)
|
||||||
| gupom | git pull --rebase origin $(git_main_branch) |
|
| gupom | git pull --rebase origin $(git_main_branch) |
|
||||||
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
|
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
|
||||||
| glum | git pull upstream $(git_main_branch) |
|
| glum | git pull upstream $(git_main_branch) |
|
||||||
| gluc | git pull upstream $(git_current_branch) |
|
| gluc | git pull upstream $(git_current_branch) |
|
||||||
| gwch | git whatchanged -p --abbrev-commit --pretty=medium |
|
| gwch | git whatchanged -p --abbrev-commit --pretty=medium |
|
||||||
| gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" |
|
| gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" |
|
||||||
| gam | git am |
|
| gam | git am |
|
||||||
|
@ -192,6 +192,11 @@ plugins=(... git)
|
||||||
| gams | git am --skip |
|
| gams | git am --skip |
|
||||||
| gama | git am --abort |
|
| gama | git am --abort |
|
||||||
| gamscp | git am --show-current-patch |
|
| gamscp | git am --show-current-patch |
|
||||||
|
| gwt | git worktree |
|
||||||
|
| gwta | git worktree add |
|
||||||
|
| gwtls | git worktree list |
|
||||||
|
| gwtmv | git worktree move |
|
||||||
|
| gwtrm | git worktree remove |
|
||||||
|
|
||||||
### Main branch preference
|
### Main branch preference
|
||||||
|
|
||||||
|
|
|
@ -315,6 +315,12 @@ alias gluc='git pull upstream $(git_current_branch)'
|
||||||
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
|
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
|
||||||
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
|
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
|
||||||
|
|
||||||
|
alias gwt='git worktree'
|
||||||
|
alias gwta='git worktree add'
|
||||||
|
alias gwtls='git worktree list'
|
||||||
|
alias gwtmv='git worktree move'
|
||||||
|
alias gwtrm='git worktree remove'
|
||||||
|
|
||||||
alias gam='git am'
|
alias gam='git am'
|
||||||
alias gamc='git am --continue'
|
alias gamc='git am --continue'
|
||||||
alias gams='git am --skip'
|
alias gams='git am --skip'
|
||||||
|
|
Loading…
Reference in a new issue