ac0924930d48217e127523809dc5d386fb3403a4

Author
Hoàng <10150902+hoang-himself@users.noreply.github.com>
Committer
GitHub <noreply@github.com>
Date

Message

feat(git): add aliases for `worktree` (#10079)

Diff

 1diff --git a/plugins/git/README.md b/plugins/git/README.md
 2index 050c13d812267c7f5b3ba2c12ea74b952ece7939..f1c8b81c498dfb6fe797ffa081184adc587c7db0 100644
 3--- a/plugins/git/README.md
 4+++ b/plugins/git/README.md
 5@@ -91,8 +91,8 @@ plugins=(... git)
 6 | gignore              | git update-index --assume-unchanged                                                                                              |
 7 | gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
 8 | git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
 9-| gk                   | gitk --all --branches &!                                                                                                          |
10-| gke                  | gitk --all $(git log -g --pretty=%h) &!                                                                                           |
11+| gk                   | gitk --all --branches &!                                                                                                         |
12+| gke                  | gitk --all $(git log -g --pretty=%h) &!                                                                                          |
13 | gl                   | git pull                                                                                                                         |
14 | glg                  | git log --stat                                                                                                                   |
15 | glgp                 | git log --stat -p                                                                                                                |
16@@ -184,7 +184,7 @@ plugins=(... git)
17 | gupom                | git pull --rebase origin $(git_main_branch)                                                                                      |
18 | gupomi               | git pull --rebase=interactive origin $(git_main_branch)                                                                          |
19 | glum                 | git pull upstream $(git_main_branch)                                                                                             |
20-| gluc                 | git pull upstream $(git_current_branch)                                                                                             |
21+| gluc                 | git pull upstream $(git_current_branch)                                                                                          |
22 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
23 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
24 | gam                  | git am                                                                                                                           |
25@@ -192,6 +192,11 @@ plugins=(... git)
26 | gams                 | git am --skip                                                                                                                    |
27 | gama                 | git am --abort                                                                                                                   |
28 | gamscp               | git am --show-current-patch                                                                                                      |
29+| gwt                  | git worktree                                                                                                                     |
30+| gwta                 | git worktree add                                                                                                                 |
31+| gwtls                | git worktree list                                                                                                                |
32+| gwtmv                | git worktree move                                                                                                                |
33+| gwtrm                | git worktree remove                                                                                                              |
34 
35 ### Main branch preference
36 
37diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
38index 5c0e6db2c3ab7221f91bc5f96dd25e3530eb9344..fc769923735e8cbbbdf3c58550062b6642c7a18c 100644
39--- a/plugins/git/git.plugin.zsh
40+++ b/plugins/git/git.plugin.zsh
41@@ -315,6 +315,12 @@ alias gluc='git pull upstream $(git_current_branch)'
42 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
43 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]"'
44 
45+alias gwt='git worktree'
46+alias gwta='git worktree add'
47+alias gwtls='git worktree list'
48+alias gwtmv='git worktree move'
49+alias gwtrm='git worktree remove'
50+
51 alias gam='git am'
52 alias gamc='git am --continue'
53 alias gams='git am --skip'