From e5120ae618292da2cc90ebdc35e61c77a9f66258 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Nov 2021 09:20:16 -0400 Subject: [PATCH] Squashed '.gitlab/' changes from da69418..66b4fdb 66b4fdb Ignore subtree pull failures git-subtree-dir: .gitlab git-subtree-split: 66b4fdb902561f7e56b772a47662fe7337a35a2a --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d431a5e..465cd3a 100644 --- a/Makefile +++ b/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