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

git progress

This commit is contained in:
rusefi 2020-04-18 13:44:41 -04:00
parent e4ba46e53b
commit 3934d6feaf
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Special/Tools/git_add_upstream.bat
View File

@ -1,6 +1,6 @@
git remote -v
git remote add wiki-git https://github.com/rusefi/rusefi_documentation.wiki.git
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 normal-git https://github.com/rusefi/rusefi_documentation.git
git remote add technical-git https://github.com/rusefi/rusefi_documentation.git
git remote -v

22
Special/Tools/git_merge_normal_git_into_wiki_git.bat
View File

@ -1,18 +1,18 @@
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 push best-wiki-git HEAD:master >> 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
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 -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
git checkout master >> 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 best-wiki-git-local >> 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

4
Special/Tools/git_merge_wiki_git_into_normal_git.bat
View File

@ -1,8 +1,8 @@
git checkout master >> log.txt 2>>err.txt
git pull >> log.txt 2>>err.txt
git fetch wiki-git >> log.txt 2>>err.txt
git merge wiki-git/master >> 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

4
Special/Tools/git_reset_my_fork_to_upstream.bat Normal file
View File

@ -0,0 +1,4 @@
git fetch technical-git
git checkout master
git reset --hard technical-git/master
git push origin master -f