dosbox-x/merge-dev-to-master.sh
Jonathan Campbell b5134c1868 more
2019-04-17 00:11:14 -07:00

24 lines
620 B
Bash
Executable File

#!/bin/bash
curbranch=`git branch | grep \* | cut -d ' ' -f 2`
if [[ x"$curbranch" == x"master" || x"$curbranch" == x"develop" ]]; then
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout develop
git pull
git push
rm -f include/build_timestamp.h
git checkout include/build_timestamp.h
git checkout master
git pull
git push
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