diff --git a/Special/Tools/git_add_upstream.bat b/Special/Tools/git_add_upstream.bat index f2843a1b..6f72527a 100644 --- a/Special/Tools/git_add_upstream.bat +++ b/Special/Tools/git_add_upstream.bat @@ -1,5 +1,6 @@ git remote -v 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 -v diff --git a/Special/Tools/git_merge_normal_git_into_wiki_git.bat b/Special/Tools/git_merge_normal_git_into_wiki_git.bat index 009ff774..25155157 100644 --- a/Special/Tools/git_merge_normal_git_into_wiki_git.bat +++ b/Special/Tools/git_merge_normal_git_into_wiki_git.bat @@ -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 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 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 pull >> log.txt 2>>err.txt git branch -d wiki-git-local >> log.txt 2>>err.txt + +