From 95c099d6acde3162e6484517580e047bbad3ac22 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 23 Dec 2023 15:06:02 -0600 Subject: [PATCH] [jasper] Fix pull for Nostalgia --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c1a691b..afaf593 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ git-setup-nostalgia-remote: .PHONY: git-pull-nostalgia git-pull-nostalgia: git fetch nostalgia-master master - git subtree pull --prefix deps/nostalgia nostalgia-master master + git subtree pull --prefix deps/nostalgia nostalgia-master master --squash .PHONY: git-push-nostalgia git-push-nostalgia: