Squash subtree on pull

Squash subtree history on pull.
2021-11-02 15:38:43 -04:00
parent 524c5beccd
commit a4b7e34e57
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -25,7 +25,7 @@ make-stash-drop:

 .PHONY: make-update
 make-update:
-	@git subtree pull --prefix .gitlab --message "Merge update from Common" -q common main
+	@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q common main

 .PHONY: make-push
 make-push: warning