diff --git a/提取指定更新.bat b/提取指定更新.bat new file mode 100644 index 00000000..c09e2724 --- /dev/null +++ b/提取指定更新.bat @@ -0,0 +1,30 @@ +@echo off + +:: лűĿ¼ +cd /d %~dp0 + +:: ¼¼ +git fetch + + +:: ʾûύĹϣֵ +set /p hash=ĿύĹϣֵ + +:: ǷΪ +if "%hash%"=="" ( + echo 󣺹ϣֵΪգ + pause + exit /b +) + +:: ִ git cherry-pick ָͻ +git cherry-pick %hash% -X theirs + +:: cherry-pick Ƿɹ +if %errorlevel% equ 0 ( + echo cherry-pick ɹ +) else ( + echo cherry-pick ʧܣͻϣֵǷȷ +) + +pause