From 21abb339fffd8e4e6702d84ce465917d588eded1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 17 Apr 2020 16:10:55 -0400 Subject: [PATCH] progress :( --- Special/Tools/git_merge_wiki_git_into_normal_git.bat | 4 ++++ 1 file changed, 4 insertions(+) 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 15ae3031..f42e7819 100644 --- a/Special/Tools/git_merge_wiki_git_into_normal_git.bat +++ b/Special/Tools/git_merge_wiki_git_into_normal_git.bat @@ -4,3 +4,7 @@ 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 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 +