Squash subtree on pull

Squash subtree history on pull.
This commit is contained in:
ducoterra
2021-11-02 15:38:43 -04:00
parent 524c5beccd
commit a4b7e34e57

View File

@@ -25,7 +25,7 @@ make-stash-drop:
.PHONY: make-update .PHONY: make-update
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 .PHONY: make-push
make-push: warning make-push: warning