Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 592840f870db328b9fd373a9b15d9a22814ec13d..d3a927f233fedd08c5c3a552220c37904487784c 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -114,6 +114,7 @@ plugins=(... git)
6 | `gma` | `git merge --abort` |
7 | `gmc` | `git merge --continue` |
8 | `gms` | `git merge --squash` |
9+| `gmff` | `git merge --ff-only` |
10 | `gmom` | `git merge origin/$(git_main_branch)` |
11 | `gmum` | `git merge upstream/$(git_main_branch)` |
12 | `gmtl` | `git mergetool --no-prompt` |
13@@ -125,6 +126,8 @@ plugins=(... git)
14 | `gprav` | `git pull --rebase --autostash -v` |
15 | `gprom` | `git pull --rebase origin $(git_main_branch)` |
16 | `gpromi` | `git pull --rebase=interactive origin $(git_main_branch)` |
17+| `gprum` | `git pull --rebase upstream $(git_main_branch)` |
18+| `gprumi` | `git pull --rebase=interactive upstream $(git_main_branch)` |
19 | `ggpull` | `git pull origin "$(git_current_branch)"` |
20 | `ggl` | `git pull origin $(current_branch)` |
21 | `gluc` | `git pull upstream $(git_current_branch)` |
22@@ -156,6 +159,7 @@ plugins=(... git)
23 | `grbd` | `git rebase $(git_develop_branch)` |
24 | `grbm` | `git rebase $(git_main_branch)` |
25 | `grbom` | `git rebase origin/$(git_main_branch)` |
26+| `grbum` | `git rebase upstream/$(git_main_branch)` |
27 | `grf` | `git reflog` |
28 | `gr` | `git remote` |
29 | `grv` | `git remote --verbose` |
30diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
31index 99f640e88b405327ce5e85ebc3732695f27b1afb..8436fb4403c36f4dec87dbf8090b89123a5fd02d 100644
32--- a/plugins/git/git.plugin.zsh
33+++ b/plugins/git/git.plugin.zsh
34@@ -255,6 +255,7 @@ alias gm='git merge'
35 alias gma='git merge --abort'
36 alias gmc='git merge --continue'
37 alias gms="git merge --squash"
38+alias gmff="git merge --ff-only"
39 alias gmom='git merge origin/$(git_main_branch)'
40 alias gmum='git merge upstream/$(git_main_branch)'
41 alias gmtl='git mergetool --no-prompt'
42@@ -274,6 +275,8 @@ compdef _git ggu=git-checkout
43
44 alias gprom='git pull --rebase origin $(git_main_branch)'
45 alias gpromi='git pull --rebase=interactive origin $(git_main_branch)'
46+alias gprum='git pull --rebase upstream $(git_main_branch)'
47+alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)'
48 alias ggpull='git pull origin "$(git_current_branch)"'
49
50 function ggl() {
51@@ -340,6 +343,7 @@ alias grbs='git rebase --skip'
52 alias grbd='git rebase $(git_develop_branch)'
53 alias grbm='git rebase $(git_main_branch)'
54 alias grbom='git rebase origin/$(git_main_branch)'
55+alias grbum='git rebase upstream/$(git_main_branch)'
56 alias grf='git reflog'
57 alias gr='git remote'
58 alias grv='git remote --verbose'