Merge remote-tracking branch 'origin/master'
This commit is contained in:
9
Makefile
9
Makefile
@@ -149,12 +149,11 @@ submodule-check :
|
||||
@echo "origin/master vs HEAD for server:"
|
||||
@cd server && git rev-parse origin/master && git rev-parse HEAD
|
||||
|
||||
submodule-master:
|
||||
cd web && git rev-parse origin/master && git pull origin master && git checkout master
|
||||
cd contract && git rev-parse origin/master && git pull origin master && git checkout master
|
||||
cd backend && git rev-parse origin/master && git pull origin master && git checkout master
|
||||
cd server && git rev-parse origin/master && git pull origin master && git checkout master
|
||||
submodule-master: # checkout master for all submodules
|
||||
git submodule foreach 'git checkout master; git pull origin master'
|
||||
|
||||
submodule-cancelAll: # checkout cancelAll for all submodules
|
||||
git submodule foreach 'git checkout cancelAll; git pull origin cancelAll'
|
||||
|
||||
# Utility targets
|
||||
|
||||
|
||||
2
backend
2
backend
Submodule backend updated: ecc9e2eb98...534b5c667b
2
contract
2
contract
Submodule contract updated: 0477592bb5...751d865844
2
web
2
web
Submodule web updated: e25239d81f...3ae1d3d888
Reference in New Issue
Block a user