e9e8c6b54d594109041bdd4bc3902b40f9ae8849
- Author
- Steven Pitts <25968054+stevenpitts@users.noreply.github.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
feat(git): add `gupom` and `gupomi` aliases (#10261)
Co-authored-by: Steven Pitts <spitts@teikametrics.com>
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index b9af3488f7a25879f59cc528da09541e7936b130..b9a0309f31e25ad0f7e0ac4fc8031a9c0c6fdae8 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -181,6 +181,8 @@ plugins=(... git)
6 | gupv | git pull --rebase -v |
7 | gupa | git pull --rebase --autostash |
8 | gupav | git pull --rebase --autostash -v |
9+| gupom | git pull --rebase origin $(git_main_branch) |
10+| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
11 | glum | git pull upstream $(git_main_branch) |
12 | gwch | git whatchanged -p --abbrev-commit --pretty=medium |
13 | gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" |
14diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
15index 8f7e623ec4bd9cce2278513e604a1b2b6590b755..be6adc7ce1d66fbe6cd6f9173adb2bf270afdbbc 100644
16--- a/plugins/git/git.plugin.zsh
17+++ b/plugins/git/git.plugin.zsh
18@@ -307,6 +307,8 @@ alias gup='git pull --rebase'
19 alias gupv='git pull --rebase -v'
20 alias gupa='git pull --rebase --autostash'
21 alias gupav='git pull --rebase --autostash -v'
22+alias gupom='git pull --rebase origin $(git_main_branch)'
23+alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
24 alias glum='git pull upstream $(git_main_branch)'
25
26 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'