joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Jonathan Campbell
2019-04-17 00:11:14 -07:00
parent 2c88a21c8e
commit b5134c1868
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
merge-dev-to-master.sh
View File

@@ -1,19 +1,23 @@
#!/bin/bash
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
curbranch=`git branch | grep \* | cut -d ' ' -f 2`
git checkout develop
git pull
git push
if [[ x"$curbranch" == x"master" || x"$curbranch" == x"develop" ]]; then
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout develop
git pull
git push
git checkout master
git pull
git push
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout master
git pull
git push
git checkout master && git merge develop && git checkout develop && git merge master && git fetch --all && git push --all && make -j
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout master && git merge develop && git checkout develop && git merge master && git fetch --all && git push --all && make -j
fi