2016-01-13 21:11:06 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
git remote add minetest https://github.com/minetest/minetest.git
|
|
|
|
|
git fetch --all
|
2016-01-15 18:04:20 +03:00
|
|
|
git pull
|
2016-08-26 10:34:37 +03:00
|
|
|
( git merge --no-edit minetest/master | grep -i "conflict" ) && exit
|
2016-01-13 21:11:06 +03:00
|
|
|
#git submodule foreach --recursive "git pull||true"
|
2016-01-26 21:40:59 +03:00
|
|
|
|
2016-01-13 21:11:06 +03:00
|
|
|
cd games
|
|
|
|
|
|
|
|
|
|
cd pixture
|
|
|
|
|
git checkout master
|
|
|
|
|
git pull
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
cd default
|
|
|
|
|
git checkout master
|
|
|
|
|
git pull
|
|
|
|
|
git remote add minetest_game https://github.com/minetest/minetest_game.git
|
|
|
|
|
git fetch --all
|
|
|
|
|
git submodule foreach --recursive "git checkout master; git pull||true"
|
2016-01-29 16:57:07 +03:00
|
|
|
git commit -a -m "update submodules"
|
2016-01-26 21:40:59 +03:00
|
|
|
( git merge --no-edit minetest_game/master | grep -i "conflict" ) && exit
|
|
|
|
|
git push
|
2016-01-13 21:11:06 +03:00
|
|
|
|
|
|
|
|
cd ..
|
2016-03-17 03:01:16 +03:00
|
|
|
git commit . -m "update submodules"
|
2016-01-13 21:11:06 +03:00
|
|
|
git push
|
|
|
|
|
|
|
|
|
|
git status
|
