Commit 870c3038 authored by Greg Pettyjohn's avatar Greg Pettyjohn
Browse files

Not tracking sync.cmd

parent c8bef65c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
*.user
*.userosscache
*.sln.docstates
sync.cmd

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

sync.cmd

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line
@echo off
echo --- Fetching master branch
git fetch upstream
echo --- Merging contents of master
git merge upstream/master
set /p response=Push merged to fork (Y/N)? 
if /i "%response:~,1%" equ "Y" goto push
if /i "%response:~,1%" equ "y" goto push
goto done

:push
echo --- Pushing merged fork
git push origin
goto done

:done
echo --- Done
exit /b