summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-02-22 21:43:18 +0100
committerLeif Johansson <leifj@sunet.se>2014-02-22 21:43:18 +0100
commit31772848b3dfcf53971ae1a98020e1ff8875aa90 (patch)
tree623e644e57cec8d6956fe692ea22b69f5db77f59 /docs
parent67337f5c7cba477b9e4a37d0e85ca5b0e7426f65 (diff)
parent9b801d3be8e0268994169729cf5d5dd4600367cb (diff)
merged pull-request
Diffstat (limited to 'docs')
-rw-r--r--docs/cosmos-puppet-ops.mkd8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/cosmos-puppet-ops.mkd b/docs/cosmos-puppet-ops.mkd
index 023c52c..46ceb50 100644
--- a/docs/cosmos-puppet-ops.mkd
+++ b/docs/cosmos-puppet-ops.mkd
@@ -210,6 +210,14 @@ as 'ro'. The read-only remote is used by multiverse scripts during host bootstra
# git remote add ro git://yourhost/myproj-cosmos.git
```
+Now edit .git/config and rename the 'master' branch to use the new 'origin' remote or
+you'll try to push to the multiverse remote! Finally create a branch for the 'multiverse'
+upstream so you can merge changes to multiverse:
+
+```
+# git checkout -b multiverse --track multiverse/master
+```
+
Note that you can maintain your repo on just about any git hosting platform, including
github, gitorius or your own local setup as long as it supports read-only "git://" access
to your repository. It is important that the remotes called 'origin' and 'ro' refer to