浏览代码

feat(git): add `gupom` and `gupomi` aliases (#10261)

Co-authored-by: Steven Pitts <spitts@teikametrics.com>
Steven Pitts 2 年之前
父节点
当前提交
e9e8c6b54d
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 2 0
      plugins/git/README.md
  2. 2 0
      plugins/git/git.plugin.zsh

+ 2 - 0
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]"           |

+ 2 - 0
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'