services/the-1122-pack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't squash on pull

Browse Source 
Don't squash updates on pull
This commit is contained in:
ducoterra
2021-11-01 20:32:27 -04:00
parent b07a2c095b
commit 9eed50962c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -23,7 +23,7 @@ make-stash-drop:
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git stash save $(STASH) @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 @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
.PHONY: make-push .PHONY: make-push