From 81c19ccd2a4f3b8ed78fe8629c22bf05421d8ceb Mon Sep 17 00:00:00 2001 From: ducoterra Date: Tue, 2 Nov 2021 15:44:43 -0400 Subject: [PATCH] Don't use remote common We're not going to allow remote updates so don't bother with remote common. --- Makefile | 2 +- README.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 207f7e1..b584e45 100644 --- a/Makefile +++ b/Makefile @@ -25,4 +25,4 @@ make-stash-drop: .PHONY: 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 diff --git a/README.md b/README.md index 2df8181..5680c6b 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ ```bash # Add the subtree as a remote -git remote add common git@gitlab.ducoterra.net:services/common.git -git subtree add --prefix .gitlab common main --squash --message "Add Common .gitlab Subtree" +git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash --message "Add Common .gitlab Subtree" # Now you can run the following to update make make-update