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

https://github.com/rusefi/rusefi_documentation/issues/37

This commit is contained in:
rusefi 2020-05-14 17:50:59 -04:00
parent 112fbdcd28
commit 2f8dcc38ee
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Special/Tools/git_add_upstream.bat
View File

@ -1,5 +1,4 @@
git remote -v
git remote add temp-wiki-git https://github.com/rusefi/rusefi_documentation.wiki.git
git remote add best-wiki-git https://github.com/rusefi/rusefi.wiki.git
git remote add technical-git https://github.com/rusefi/rusefi_documentation.git
git remote -v

7
Special/Tools/git_merge_normal_git_into_wiki_git.bat
View File

@ -1,7 +1,6 @@
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
@ -10,15 +9,9 @@ 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
git branch -d best-wiki-git-local >> log.txt 2>>err.txt

3
Special/Tools/git_merge_wiki_git_into_normal_git.bat
View File

@ -2,9 +2,6 @@
git checkout master >> log.txt 2>>err.txt
git reset --hard origin/master >> log.txt 2>>err.txt
git pull >> log.txt 2>>err.txt
git fetch temp-wiki-git >> log.txt 2>>err.txt
git merge temp-wiki-git/master >> log.txt 2>>err.txt
git push >> log.txt 2>>err.txt
git fetch best-wiki-git >> log.txt 2>>err.txt
git merge best-wiki-git/master >> log.txt 2>>err.txt