dosbox-x/merge-dev-to-master.sh
Jonathan Campbell 8b2867156d more
2018-05-03 18:54:09 -07:00

20 lines
440 B
Bash
Executable File

#!/bin/bash
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