From 1ecddd5d9af7fa4ae0eb76421f5e6b648e451eee Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sat, 11 Apr 2020 15:58:07 -0400
Subject: [PATCH] more tools

---
 Special/Tools/.gitignore                             | 2 ++
 Special/Tools/git_merge_wiki_git_into_normal_git.bat | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 Special/Tools/.gitignore
 create mode 100644 Special/Tools/git_merge_wiki_git_into_normal_git.bat

diff --git a/Special/Tools/.gitignore b/Special/Tools/.gitignore
new file mode 100644
index 00000000..24dce47e
--- /dev/null
+++ b/Special/Tools/.gitignore
@@ -0,0 +1,2 @@
+err.txt
+log.txt
\ No newline at end of file
diff --git a/Special/Tools/git_merge_wiki_git_into_normal_git.bat b/Special/Tools/git_merge_wiki_git_into_normal_git.bat
new file mode 100644
index 00000000..03241b74
--- /dev/null
+++ b/Special/Tools/git_merge_wiki_git_into_normal_git.bat
@@ -0,0 +1,5 @@
+
+git checkout master                         >> 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