From 13085be69aa1b30274f07c210042025395b9ccfd Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Nov 2021 20:42:52 -0400 Subject: [PATCH] Squashed '.gitlab/' changes from b07a2c0..9eed509 9eed509 Don't squash on pull git-subtree-dir: .gitlab git-subtree-split: 9eed50962cbd9bec25da3a82908d0d691eacb759 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 61a7dbb..4eb7ed6 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ make-stash-drop: .PHONY: make-update make-update: @git stash save $(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 @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi .PHONY: make-push