services/charts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Squashed '.gitlab/' changes from ba12c92..da69418

Browse Source 
da69418 Switch to url-based subtree with `make-update`

git-subtree-dir: .gitlab
git-subtree-split: da69418b0d
This commit is contained in:
ducoterra
2021-11-01 09:05:55 -04:00
parent 3d29d92f8a
commit dd39e3335a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -8,3 +8,9 @@ include .gitlab/make/docker.makefile
include .gitlab/make/helm.makefile
include .gitlab/make/kaniko.makefile
include .gitlab/make/truenas.makefile
.PHONY: make-update
make-update:
@git stash
@git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
@git stash pop

5
README.md
View File

@@ -2,9 +2,8 @@
```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
git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
# Now you can run the following to update
git subtree pull --prefix .gitlab common main
make make-update
```