joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Jonathan Campbell 2017-05-08 03:59:56 -07:00
parent 2a470cf17d
commit 22485b2ecf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
merge-to-win-ci
View File

@ -1,6 +1,12 @@
#!/bin/bash #!/bin/bash
git checkout master-win-ci || exit 1
git merge --commit -m 'update' origin/master || exit 1 doit() {
git push origin master-win-ci || exit 1 git checkout master-win-ci || exit 1
git merge --commit -m 'update' origin/master || exit 1
git push origin master-win-ci || exit 1
exit 0
}
doit || exit 1
git checkout master || exit 1 git checkout master || exit 1