Merge commit '13085be69aa1b30274f07c210042025395b9ccfd'

2021-11-01 20:42:52 -04:00
parent ece42df00c 13085be69a
commit 13a4740c14
1 changed files with 1 additions and 1 deletions
--- a/.gitlab/Makefile
+++ b/.gitlab/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