rusefi
/
rusefi_documentation
mirror of https://github.com/rusefi/rusefi_documentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'technical-git/master' into best-wiki-git-local

This commit is contained in:
rusefi 2020-04-29 13:49:55 -04:00
parent ee69847dd8 d3db86b6b9
commit ddf2292881
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Special/Tools/git_merge_normal_git_into_wiki_git.bat
View File

@ -1,17 +1,21 @@
echo Fetching everything >> log.txt 2>>err.txt
git fetch technical-git >> log.txt 2>>err.txt
git fetch best-wiki-git >> log.txt 2>>err.txt
git fetch temp-wiki-git >> log.txt 2>>err.txt
echo Merging technical into best wiki >> log.txt 2>>err.txt
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
echo Merging technical into wiki which we shall remove >> log.txt 2>>err.txt
git checkout -b temp-wiki-git-local temp-wiki-git/master >> log.txt 2>>err.txt
git merge technical-git/master >> log.txt 2>>err.txt
git push temp-wiki-git HEAD:master >> log.txt 2>>err.txt
echo Cleanup >> log.txt 2>>err.txt
git checkout master >> log.txt 2>>err.txt
git pull >> log.txt 2>>err.txt
git branch -d temp-wiki-git-local >> log.txt 2>>err.txt