e857cc8cb93cf5f1f474c8a84b6ec644be7bdd2e

Author
Wei Huang <weih@hey.com>
Committer
GitHub <noreply@github.com>
Date

Message

feat(git): alias `gluc` to sync with current branch in upstream (#11101)

Diff

 1diff --git a/plugins/git/README.md b/plugins/git/README.md
 2index 0700dcc32d5178bd4d72a84a2cee35a184537759..050c13d812267c7f5b3ba2c12ea74b952ece7939 100644
 3--- a/plugins/git/README.md
 4+++ b/plugins/git/README.md
 5@@ -184,6 +184,7 @@ plugins=(... git)
 6 | gupom                | git pull --rebase origin $(git_main_branch)                                                                                      |
 7 | gupomi               | git pull --rebase=interactive origin $(git_main_branch)                                                                          |
 8 | glum                 | git pull upstream $(git_main_branch)                                                                                             |
 9+| gluc                 | git pull upstream $(git_current_branch)                                                                                             |
10 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
11 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
12 | gam                  | git am                                                                                                                           |
13diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
14index be6adc7ce1d66fbe6cd6f9173adb2bf270afdbbc..f25453bc1d2b3ba50e156cb35fad5135c1ccc9fd 100644
15--- a/plugins/git/git.plugin.zsh
16+++ b/plugins/git/git.plugin.zsh
17@@ -310,6 +310,7 @@ alias gupav='git pull --rebase --autostash -v'
18 alias gupom='git pull --rebase origin $(git_main_branch)'
19 alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
20 alias glum='git pull upstream $(git_main_branch)'
21+alias gluc='git pull upstream $(git_current_branch)'
22 
23 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
24 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]"'