mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-05-08 19:32:39 +08:00
24 lines
620 B
Bash
Executable File
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
|