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 @git clone https://github.com/Open-RSC/Wiki.git Website/Wiki
pull-game: pull-game:
@$(shell cd Game && git pull) @$(shell cd Game && git reset HEAD --hard && git pull)
pull-website: pull-website:
@$(shell cd Website && git pull) @$(shell cd Website && git reset HEAD --hard && git pull)
pull-wiki: pull-wiki:
@$(shell cd Website/Wiki && git pull) @$(shell cd Website/Wiki && git reset HEAD --hard && git pull)
pull-game-windows: pull-game-windows:
@cd Game && git pull @cd Game && git reset HEAD --hard && git pull
pull-website-windows: pull-website-windows:
@cd Website && git pull @cd Website && git reset HEAD --hard && git pull
pull-wiki-windows: pull-wiki-windows:
@cd Website/Wiki && git pull @cd Website/Wiki git reset HEAD --hard && && git pull
logs: logs:
@docker-compose logs -f @docker-compose logs -f

2
Setup_Linux_Mac.sh
View File

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