From a4359425884994b35994e0ed45e8850db42ae35d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 19 Apr 2020 09:36:53 -0400 Subject: [PATCH] better now? --- .../git_merge_personal_technical_into_personal_wiki_git.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/Special/Tools/git_merge_personal_technical_into_personal_wiki_git.bat b/Special/Tools/git_merge_personal_technical_into_personal_wiki_git.bat index 18c75e1c..61b1c52d 100644 --- a/Special/Tools/git_merge_personal_technical_into_personal_wiki_git.bat +++ b/Special/Tools/git_merge_personal_technical_into_personal_wiki_git.bat @@ -3,4 +3,5 @@ git fetch personal-wiki-git >> log.txt 2>> git checkout -b personal-wiki-git-local personal-wiki-git/master >> log.txt 2>>err.txt git merge origin/master >> log.txt 2>>err.txt git push personal-wiki-git HEAD:master >> log.txt 2>>err.txt +git checkout master >> log.txt 2>>err.txt git branch -d personal-wiki-git-local >> log.txt 2>>err.txt