From 80effb7e2e4644b81b53e8e10799041637d04f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Thu, 10 Aug 2023 18:21:32 +0200 Subject: [PATCH] ensure FWK upstream is always present --- MAKE.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAKE.bat b/MAKE.bat index 9b154ed..5c9a303 100644 --- a/MAKE.bat +++ b/MAKE.bat @@ -376,8 +376,9 @@ rem move /y 3rd_*.? engine\split\ ) if "%1"=="pull" ( - git fetch v4k - git merge -Xrename-threshold=50 v4k/main + git remote add fwk git@github.com:r-lyeh/FWK.git >NUL + git fetch fwk + git merge -Xrename-threshold=50 fwk/main exit /b )