58478d0888aa842adc71aded80009cba5be190ec
- Author
- Markus Hofbauer <markus.hofbauer@tum.de>
- Committer
- GitHub <noreply@github.com>
- Date
Message
feat(git): Add alias for rebasing to origin/main-branch (#10445)
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 1130808749457866a1df68cb506ecf442a7b0d3d..b9af3488f7a25879f59cc528da09541e7936b130 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -130,6 +130,7 @@ plugins=(... git)
6 | grbd | git rebase $(git_develop_branch) |
7 | grbi | git rebase -i |
8 | grbm | git rebase $(git_main_branch) |
9+| grbom | git rebase origin/$(git_main_branch) |
10 | grbo | git rebase --onto |
11 | grbs | git rebase --skip |
12 | grev | git revert |
13diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
14index 5a3c9828731f84cd3351640fae97ef2da91b0b8b..648fa0a33daba64e1985b8b74a1e14afb29c6350 100644
15--- a/plugins/git/git.plugin.zsh
16+++ b/plugins/git/git.plugin.zsh
17@@ -251,6 +251,7 @@ alias grbc='git rebase --continue'
18 alias grbd='git rebase $(git_develop_branch)'
19 alias grbi='git rebase -i'
20 alias grbm='git rebase $(git_main_branch)'
21+alias grbom='git rebase origin/$(git_main_branch)'
22 alias grbo='git rebase --onto'
23 alias grbs='git rebase --skip'
24 alias grev='git revert'