From 2f8dcc38ee6bedee6baa6823f9f3e77691c72c3d Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 14 May 2020 17:50:59 -0400 Subject: [PATCH] https://github.com/rusefi/rusefi_documentation/issues/37 --- Special/Tools/git_add_upstream.bat | 1 - Special/Tools/git_merge_normal_git_into_wiki_git.bat | 7 ------- Special/Tools/git_merge_wiki_git_into_normal_git.bat | 3 --- 3 files changed, 11 deletions(-) diff --git a/Special/Tools/git_add_upstream.bat b/Special/Tools/git_add_upstream.bat index a6c767d4..4a06fe67 100644 --- a/Special/Tools/git_add_upstream.bat +++ b/Special/Tools/git_add_upstream.bat @@ -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 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 c9895dac..c125c4c0 100644 --- a/Special/Tools/git_merge_normal_git_into_wiki_git.bat +++ b/Special/Tools/git_merge_normal_git_into_wiki_git.bat @@ -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 diff --git a/Special/Tools/git_merge_wiki_git_into_normal_git.bat b/Special/Tools/git_merge_wiki_git_into_normal_git.bat index 2e653314..3d62ae39 100644 --- a/Special/Tools/git_merge_wiki_git_into_normal_git.bat +++ b/Special/Tools/git_merge_wiki_git_into_normal_git.bat @@ -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