diff options
| author | Steven Pitts <25968054+stevenpitts@users.noreply.github.com> | 2022-05-25 10:32:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 16:32:33 +0200 |
| commit | e9e8c6b54d594109041bdd4bc3902b40f9ae8849 (patch) | |
| tree | d643b21ecdf75dc6a2255d55a1ab124e91178a28 /plugins | |
| parent | 39b600e9e564db3dec265fcf2e3db4b5568dd93a (diff) | |
| download | zsh-e9e8c6b54d594109041bdd4bc3902b40f9ae8849.tar.gz zsh-e9e8c6b54d594109041bdd4bc3902b40f9ae8849.tar.bz2 zsh-e9e8c6b54d594109041bdd4bc3902b40f9ae8849.zip | |
feat(git): add `gupom` and `gupomi` aliases (#10261)
Co-authored-by: Steven Pitts <spitts@teikametrics.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/README.md | 2 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md index b9af3488f..b9a0309f3 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -181,6 +181,8 @@ plugins=(... git) | gupv | git pull --rebase -v | | gupa | git pull --rebase --autostash | | gupav | git pull --rebase --autostash -v | +| gupom | git pull --rebase origin $(git_main_branch) | +| gupomi | git pull --rebase=interactive origin $(git_main_branch) | | glum | git pull upstream $(git_main_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]" | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 8f7e623ec..be6adc7ce 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -307,6 +307,8 @@ alias gup='git pull --rebase' alias gupv='git pull --rebase -v' alias gupa='git pull --rebase --autostash' 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 gwch='git whatchanged -p --abbrev-commit --pretty=medium' |