services/Common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't reset head after subtree pull, it breaks things

Browse Source
This commit is contained in:
ducoterra
2021-12-12 19:26:02 -05:00
parent 66b436219f
commit 91b77b3d31
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -16,8 +16,6 @@ include .gitlab/make/git.makefile
include .gitlab/make/kubectl.makefile include .gitlab/make/kubectl.makefile
# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main # git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
# git reset head~1
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH) @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
@git reset head~1