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