From 6bbe55ef29f72e0c715b61cdb390b7aaa62748e5 Mon Sep 17 00:00:00 2001 From: Sergio Livi Date: Tue, 24 Aug 2021 10:20:29 +0200 Subject: [PATCH] update_plugin: force rebase=false --- scripts/update_plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_plugin.sh b/scripts/update_plugin.sh index 68bf605..a986438 100755 --- a/scripts/update_plugin.sh +++ b/scripts/update_plugin.sh @@ -21,7 +21,7 @@ pull_changes() { local plugin="$1" local plugin_path="$(plugin_path_helper "$plugin")" cd "$plugin_path" && - GIT_TERMINAL_PROMPT=0 git pull && + GIT_TERMINAL_PROMPT=0 git pull --rebase=false && GIT_TERMINAL_PROMPT=0 git submodule update --init --recursive }