Don't use remote common
We're not going to allow remote updates so don't bother with remote common.
This commit is contained in:
2
Makefile
2
Makefile
@@ -25,4 +25,4 @@ make-stash-drop:
|
|||||||
|
|
||||||
.PHONY: make-update
|
.PHONY: make-update
|
||||||
make-update:
|
make-update:
|
||||||
@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q common main
|
@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Add the subtree as a remote
|
# Add the subtree as a remote
|
||||||
git remote add common git@gitlab.ducoterra.net:services/common.git
|
git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash --message "Add Common .gitlab Subtree"
|
||||||
git subtree add --prefix .gitlab common main --squash --message "Add Common .gitlab Subtree"
|
|
||||||
|
|
||||||
# Now you can run the following to update
|
# Now you can run the following to update
|
||||||
make make-update
|
make make-update
|
||||||
|
|||||||
Reference in New Issue
Block a user