From ab0c451233759f101fbc2e9be9fc2e284eebb394 Mon Sep 17 00:00:00 2001 From: Marcelo Aimone Date: Tue, 16 Jul 2024 16:52:56 +0200 Subject: [PATCH] git pull alias with rebase and submodules --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index c10f1d88e..9490009cc 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -125,6 +125,7 @@ plugins=(... git) | `gprav` | `git pull --rebase --autostash -v` | | `gprom` | `git pull --rebase origin $(git_main_branch)` | | `gpromi` | `git pull --rebase=interactive origin $(git_main_branch)` | +| `gprs` | `git pull --rebase --recurse-submodules` | | `ggpull` | `git pull origin "$(git_current_branch)"` | | `ggl` | `git pull origin $(current_branch)` | | `gluc` | `git pull upstream $(git_current_branch)` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 99fcc4d07..0f6a8da76 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -265,6 +265,7 @@ alias gpr='git pull --rebase' alias gprv='git pull --rebase -v' alias gpra='git pull --rebase --autostash' alias gprav='git pull --rebase --autostash -v' +alias gprs='git pull --rebase --recurse-submodules' function ggu() { [[ "$#" != 1 ]] && local b="$(git_current_branch)"