2016-01-17 15:53:49 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
cd ..
|
2016-01-28 15:00:24 +03:00
|
|
|
git remote add upstream https://github.com/freeminer/freeminer.git
|
2016-01-17 15:53:49 +03:00
|
|
|
git fetch --all
|
|
|
|
|
git pull
|
2016-01-28 15:00:24 +03:00
|
|
|
( git merge --no-edit upstream/master | grep -i "conflict" ) && exit
|
|
|
|
|
git push
|
2016-01-17 15:53:49 +03:00
|
|
|
git submodule update --init --recursive
|
|
|
|
|
git status
|
