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

Squashed '.gitlab/' changes from da69418..66b4fdb

Browse Source 
66b4fdb Ignore subtree pull failures

git-subtree-dir: .gitlab
git-subtree-split: 66b4fdb902
This commit is contained in:
ducoterra
2021-11-01 09:20:16 -04:00
parent dd39e3335a
commit e5120ae618
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -12,5 +12,5 @@ include .gitlab/make/truenas.makefile
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git stash @git stash
@git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash -git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
@git stash pop @git stash pop