summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Hofbauer <markus.hofbauer@tum.de>2021-11-27 20:30:03 +0100
committerGitHub <noreply@github.com>2021-11-27 11:30:03 -0800
commit58478d0888aa842adc71aded80009cba5be190ec (patch)
treed55cd16228506940d8b4dea63b886c34ebd74577
parent8e5f3db305bb1fc363d3fe98c2d1177f0027a5bc (diff)
downloadzsh-58478d0888aa842adc71aded80009cba5be190ec.tar.gz
zsh-58478d0888aa842adc71aded80009cba5be190ec.tar.bz2
zsh-58478d0888aa842adc71aded80009cba5be190ec.zip
feat(git): Add alias for rebasing to origin/main-branch (#10445)
-rw-r--r--plugins/git/README.md1
-rw-r--r--plugins/git/git.plugin.zsh1
2 files changed, 2 insertions, 0 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md
index 113080874..b9af3488f 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -130,6 +130,7 @@ plugins=(... git)
| grbd | git rebase $(git_develop_branch) |
| grbi | git rebase -i |
| grbm | git rebase $(git_main_branch) |
+| grbom | git rebase origin/$(git_main_branch) |
| grbo | git rebase --onto |
| grbs | git rebase --skip |
| grev | git revert |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5a3c98287..648fa0a33 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -251,6 +251,7 @@ alias grbc='git rebase --continue'
alias grbd='git rebase $(git_develop_branch)'
alias grbi='git rebase -i'
alias grbm='git rebase $(git_main_branch)'
+alias grbom='git rebase origin/$(git_main_branch)'
alias grbo='git rebase --onto'
alias grbs='git rebase --skip'
alias grev='git revert'