From e857cc8cb93cf5f1f474c8a84b6ec644be7bdd2e Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Wed, 10 Aug 2022 07:17:47 -0700 Subject: [PATCH] feat(git): alias `gluc` to sync with current branch in upstream (#11101) --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index 0700dcc32..050c13d81 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -184,6 +184,7 @@ plugins=(... git) | gupom | git pull --rebase origin $(git_main_branch) | | gupomi | git pull --rebase=interactive origin $(git_main_branch) | | glum | git pull upstream $(git_main_branch) | +| gluc | git pull upstream $(git_current_branch) | | 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]" | | gam | git am | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index be6adc7ce..f25453bc1 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -310,6 +310,7 @@ alias gupav='git pull --rebase --autostash -v' alias gupom='git pull --rebase origin $(git_main_branch)' alias gupomi='git pull --rebase=interactive origin $(git_main_branch)' alias glum='git pull upstream $(git_main_branch)' +alias gluc='git pull upstream $(git_current_branch)' 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]"'