diff --git a/Special/Tools/git_add_upstream.bat b/Special/Tools/git_add_upstream.bat index 6f72527a..a6c767d4 100644 --- a/Special/Tools/git_add_upstream.bat +++ b/Special/Tools/git_add_upstream.bat @@ -1,6 +1,6 @@ git remote -v -git remote add wiki-git https://github.com/rusefi/rusefi_documentation.wiki.git +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 normal-git https://github.com/rusefi/rusefi_documentation.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 effda3dc..ccb579e6 100644 --- a/Special/Tools/git_merge_normal_git_into_wiki_git.bat +++ b/Special/Tools/git_merge_normal_git_into_wiki_git.bat @@ -1,18 +1,18 @@ -git fetch normal-git >> 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 best-wiki-git HEAD:master >> log.txt 2>>err.txt +git checkout -b best-wiki-git-local best-wiki-git/master >> log.txt 2>>err.txt +git merge technical-git/master >> log.txt 2>>err.txt +git push best-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 -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 -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 -git branch -d best-wiki-git-local >> 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 f42e7819..dd56842b 100644 --- a/Special/Tools/git_merge_wiki_git_into_normal_git.bat +++ b/Special/Tools/git_merge_wiki_git_into_normal_git.bat @@ -1,8 +1,8 @@ git checkout master >> log.txt 2>>err.txt 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 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 diff --git a/Special/Tools/git_reset_my_fork_to_upstream.bat b/Special/Tools/git_reset_my_fork_to_upstream.bat new file mode 100644 index 00000000..c8e580b4 --- /dev/null +++ b/Special/Tools/git_reset_my_fork_to_upstream.bat @@ -0,0 +1,4 @@ +git fetch technical-git +git checkout master +git reset --hard technical-git/master +git push origin master -f \ No newline at end of file