update make pull

main
Dominik Madarász 2023-08-10 18:26:54 +02:00
parent 109a41093a
commit ee76c55b0e
1 changed files with 1 additions and 1 deletions

View File

@ -376,7 +376,7 @@ rem move /y 3rd_*.? engine\split\
) )
if "%1"=="pull" ( if "%1"=="pull" (
git remote add fwk git@github.com:r-lyeh/FWK.git >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 fwk/main
exit /b exit /b