2019-04-14 16:20:38 +08:00
|
|
|
@REM Jpom多分支、多远端合并代码命令
|
2019-03-13 17:59:04 +08:00
|
|
|
|
2019-02-21 13:54:25 +08:00
|
|
|
@echo off
|
|
|
|
|
|
|
|
|
|
cd ../
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 拉取远程分支[master]
|
2019-02-27 21:11:06 +08:00
|
|
|
call git checkout dev
|
2019-02-21 13:54:25 +08:00
|
|
|
|
|
|
|
|
call git fetch github master:master
|
|
|
|
|
|
|
|
|
|
call git fetch gitee master:master
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 拉取远程分支[dev]
|
2019-02-21 13:54:25 +08:00
|
|
|
call git checkout master
|
|
|
|
|
|
2019-02-27 21:11:06 +08:00
|
|
|
call git fetch github dev:dev
|
|
|
|
|
|
|
|
|
|
call git fetch gitee dev:dev
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 开始合并分支[master]
|
2019-02-27 21:11:06 +08:00
|
|
|
call git checkout dev
|
|
|
|
|
call git merge master
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 开始合并分支[dev]
|
2019-02-27 21:11:06 +08:00
|
|
|
call git checkout master
|
2019-02-21 13:54:25 +08:00
|
|
|
call git merge dev
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 推送到gitee
|
2019-02-27 21:11:06 +08:00
|
|
|
|
|
|
|
|
call git push gitee dev
|
|
|
|
|
|
2019-02-21 13:54:25 +08:00
|
|
|
call git push gitee master
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 推送到github
|
2019-02-21 13:54:25 +08:00
|
|
|
call git push github dev
|
|
|
|
|
|
|
|
|
|
call git push github master
|
|
|
|
|
|
2019-04-14 16:20:38 +08:00
|
|
|
echo 推送tags
|
2019-02-27 21:11:06 +08:00
|
|
|
call git push github --tags
|
2019-02-22 18:35:42 +08:00
|
|
|
|
|
|
|
|
call git push gitee --tags
|
|
|
|
|
|
2019-02-21 13:54:25 +08:00
|
|
|
call git checkout dev
|
