From d3db86b6b945d40f897fa38184c9ef8c347b6c2d Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 29 Apr 2020 13:48:14 -0400 Subject: [PATCH] nicer messages --- Special/Tools/git_merge_normal_git_into_wiki_git.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 9cca522e..c9895dac 100644 --- a/Special/Tools/git_merge_normal_git_into_wiki_git.bat +++ b/Special/Tools/git_merge_normal_git_into_wiki_git.bat @@ -1,17 +1,21 @@ +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 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 +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