2020-04-29 10:48:14 -07:00
|
|
|
echo Fetching everything >> log.txt 2>>err.txt
|
2020-04-18 10:47:17 -07:00
|
|
|
git fetch technical-git >> log.txt 2>>err.txt
|
2020-04-19 11:27:43 -07:00
|
|
|
git fetch best-wiki-git >> log.txt 2>>err.txt
|
2020-04-12 09:02:13 -07:00
|
|
|
|
2020-04-29 10:48:14 -07:00
|
|
|
|
|
|
|
echo Merging technical into best wiki >> log.txt 2>>err.txt
|
2020-04-18 10:44:41 -07:00
|
|
|
git checkout -b best-wiki-git-local best-wiki-git/master >> log.txt 2>>err.txt
|
|
|
|
git merge technical-git/master >> log.txt 2>>err.txt
|
|
|
|
git push best-wiki-git HEAD:master >> log.txt 2>>err.txt
|
2020-04-11 13:27:32 -07:00
|
|
|
|
2020-04-12 09:02:13 -07:00
|
|
|
|
2020-04-29 10:48:14 -07:00
|
|
|
echo Cleanup >> log.txt 2>>err.txt
|
2020-04-18 10:44:41 -07:00
|
|
|
git checkout master >> log.txt 2>>err.txt
|
|
|
|
git pull >> log.txt 2>>err.txt
|
|
|
|
git branch -d best-wiki-git-local >> log.txt 2>>err.txt
|
2020-04-12 09:02:13 -07:00
|
|
|
|
|
|
|
|