From 458f0e6bd41270bf4e14751e201cf3575327fc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Fri, 11 Aug 2023 20:59:46 +0200 Subject: [PATCH] update MAKE.bat --- MAKE.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAKE.bat b/MAKE.bat index c5dedfa..d49b1c8 100644 --- a/MAKE.bat +++ b/MAKE.bat @@ -391,7 +391,7 @@ rem move /y 3rd_*.? engine\split\ if "%1"=="pull" ( git remote add fwk git@github.com:r-lyeh/FWK.git 2>NUL git fetch fwk - git merge -Xrename-threshold=50 fwk/main + git merge -Xrename-threshold=50 --allow-unrelated-histories fwk/main exit /b )