psi-jack/tpm
1
0
Fork 0
mirror of synced 2024-12-13 19:05:45 -05:00
Code Issues Releases Wiki Activity

update_plugin: force rebase=false

Browse source
This commit is contained in:
Sergio Livi 2021-08-24 10:20:29 +02:00
parent 693e5a2a0f
commit 6bbe55ef29
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/update_plugin.sh
View file

@ -21,7 +21,7 @@ pull_changes() {
local plugin="$1" local plugin="$1"
local plugin_path="$(plugin_path_helper "$plugin")" local plugin_path="$(plugin_path_helper "$plugin")"
cd "$plugin_path" && 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 GIT_TERMINAL_PROMPT=0 git submodule update --init --recursive
} }