diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-03-03 10:33:21 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-03-03 10:33:21 +0100 |
| commit | 88d39d92746bed841812305e3cfa3fe5749c51ff (patch) | |
| tree | 57ef9faa53d57f62358e1f4cdc71dc51d8fc8577 /docs | |
| parent | 8d2f9cc27ca9af1c16f7aa9597a93de00ed0ae2e (diff) | |
| parent | 60e026c0b1b2e1440e0721e634cf7c803b8e5907 (diff) | |
Merge branch 'multiverse'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/cosmos-puppet-ops.mkd | 8 |
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 |