H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Forcing git resets to head before git pull

Browse Source
This commit is contained in:
Marwolf
2018-07-14 20:39:11 -04:00
parent 848f24ca52
commit a24a402065
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -34,22 +34,22 @@ clone-windows-wiki:
@git clone https://github.com/Open-RSC/Wiki.git Website/Wiki
pull-game:
@$(shell cd Game && git pull)
@$(shell cd Game && git reset HEAD --hard && git pull)
pull-website:
@$(shell cd Website && git pull)
@$(shell cd Website && git reset HEAD --hard && git pull)
pull-wiki:
@$(shell cd Website/Wiki && git pull)
@$(shell cd Website/Wiki && git reset HEAD --hard && git pull)
pull-game-windows:
@cd Game && git pull
@cd Game && git reset HEAD --hard && git pull
pull-website-windows:
@cd Website && git pull
@cd Website && git reset HEAD --hard && git pull
pull-wiki-windows:
@cd Website/Wiki && git pull
@cd Website/Wiki git reset HEAD --hard && && git pull
logs:
@docker-compose logs -f

2
Setup_Linux_Mac.sh
View File

@@ -266,7 +266,7 @@ fi
clear
echo "Checking the Docker Home git repo for any recent updates."
echo ""
git pull
git reset HEAD --hard && git pull
echo ""
clear
echo "${RED}Open RSC Installer:${NC}