Squashed '.gitlab/' changes from da69418..66b4fdb
66b4fdbIgnore subtree pull failures git-subtree-dir: .gitlab git-subtree-split:66b4fdb902
This commit is contained in:
2
Makefile
2
Makefile
@@ -12,5 +12,5 @@ include .gitlab/make/truenas.makefile
|
||||
.PHONY: make-update
|
||||
make-update:
|
||||
@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
|
||||
|
||||
Reference in New Issue
Block a user