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 'non-wiki-git/master'

This commit is contained in:
rusefi 2020-04-12 12:02:33 -04:00
parent a6c43437f5 8ee0714362
commit 5730668469
2 changed files with 11 additions and 2 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,6 @@
git remote -v git remote -v
git remote add wiki-git https://github.com/rusefi/rusefi_documentation.wiki.git git remote add 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 normal-git https://github.com/rusefi/rusefi_documentation.git git remote add normal-git https://github.com/rusefi/rusefi_documentation.git
git remote -v git remote -v

12
Special/Tools/git_merge_normal_git_into_wiki_git.bat
View File

@ -1,10 +1,18 @@
git checkout -b wiki-git-local wiki-git/master >> log.txt 2>>err.txt
git fetch normal-git >> log.txt 2>>err.txt git fetch normal-git >> log.txt 2>>err.txt
git checkout -b wiki-git-local wiki-git/master >> log.txt 2>>err.txt
git merge normal-git/master >> log.txt 2>>err.txt git merge normal-git/master >> log.txt 2>>err.txt
git push wiki-git HEAD:master >> log.txt 2>>err.txt git push wiki-git HEAD:master >> log.txt 2>>err.txt
git checkout -b best-wiki-git-local wiki-git/master >> log.txt 2>>err.txt
git merge normal-git/master >> log.txt 2>>err.txt
git push wiki-git HEAD:master >> log.txt 2>>err.txt
git checkout master >> log.txt 2>>err.txt git checkout master >> log.txt 2>>err.txt
git pull >> log.txt 2>>err.txt git pull >> log.txt 2>>err.txt
git branch -d wiki-git-local >> log.txt 2>>err.txt git branch -d wiki-git-local >> log.txt 2>>err.txt