update MAKE.bat
parent
b118b990b8
commit
458f0e6bd4
2
MAKE.bat
2
MAKE.bat
|
@ -391,7 +391,7 @@ rem move /y 3rd_*.? engine\split\
|
||||||
if "%1"=="pull" (
|
if "%1"=="pull" (
|
||||||
git remote add fwk git@github.com:r-lyeh/FWK.git 2>NUL
|
git remote add fwk git@github.com:r-lyeh/FWK.git 2>NUL
|
||||||
git fetch fwk
|
git fetch fwk
|
||||||
git merge -Xrename-threshold=50 fwk/main
|
git merge -Xrename-threshold=50 --allow-unrelated-histories fwk/main
|
||||||
exit /b
|
exit /b
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue