mandersson/matrix-ops
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Multiverse master has been renamed to main, so updating documentation to reflect that

Browse source
This commit is contained in:
Micke Nordin 2023-07-03 15:14:52 +02:00
parent 9bfac2520b
commit aebaccd5ba
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
docs/cosmos-puppet-ops.mkd
View file

@ -206,25 +206,31 @@ changes for your administrative domain. Also add a read-only version of this rem
as 'ro'. The read-only remote is used by multiverse scripts during host bootstrap. as 'ro'. The read-only remote is used by multiverse scripts during host bootstrap.
``` ```
# git remote add origin git@yourhost:myproj-cosmos.git # git remote add origin git+ssh://git@yourhost:myproj-cosmos.git
# git remote add ro https://yourhost/myproj-cosmos.git # git remote add ro https://yourhost/myproj-cosmos.git
``` ```
Now edit .git/config and rename the 'master' branch to use the new 'origin' remote or Now edit .git/config and rename the 'main' branch to use the new 'origin' remote or
you'll try to push to the multiverse remote! you'll try to push to the multiverse remote!
``` ```
[branch "master"] [branch "main"]
remote = origin remote = origin
merge = refs/heads/master merge = refs/heads/main
``` ```
Finally create a branch for the 'multiverse' upstream so you can merge changes to multiverse: Now create a branch for the 'multiverse' upstream so you can merge changes to multiverse:
``` ```
# git checkout -b multiverse --track multiverse/main # git checkout -b multiverse --track multiverse/main
``` ```
Finally, you might need to push you main branch upstream to the new origin
```
# git checkout main
# git push -u origin main
```
Note that you can maintain your repo on just about any git hosting platform, including Note that you can maintain your repo on just about any git hosting platform, including
github, gitorious or your own local setup as long as it supports read-only access to your github, gitorious or your own local setup as long as it supports read-only access to your
repository. It is important that the remotes called 'origin' and 'ro' refer to your repository. It is important that the remotes called 'origin' and 'ro' refer to your
@ -246,7 +252,7 @@ At this point you should create and sign your first tag:
``` ```
If Git complains during the first run of bump-tag that "Your configuration specifies to If Git complains during the first run of bump-tag that "Your configuration specifies to
merge with the ref 'master' from the remote, but no such ref was fetched." then you merge with the ref 'main' from the remote, but no such ref was fetched." then you
have run 'git push' to initialize the connection with the remote repository. have run 'git push' to initialize the connection with the remote repository.
Make sure that you are using the key whose public key you just added to the repository! You Make sure that you are using the key whose public key you just added to the repository! You
@ -418,7 +424,7 @@ The multiverse template will continue to evolve and sometimes it may be desirabl
``` ```
# git checkout multiverse # git checkout multiverse
# git pull # git pull
# git checkout master # git checkout main
# git merge multiverse # git merge multiverse
``` ```