more on git drama

2019-06-25 20:32:22 -04:00 · 2019-06-25 20:32:22 -04:00 · ccd9b6cce7
parent 50bf018fe9
commit ccd9b6cce7
1 changed files with 2 additions and 0 deletions
--- a/misc/git_scripts/git_fetch_merge.bat
+++ b/misc/git_scripts/git_fetch_merge.bat
@ -0,0 +1,2 @@
+git fetch upstream
+git merge origin/master