summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2017-07-24 17:21:32 +0200
committerJulien Dessaux2017-07-24 17:21:32 +0200
commit45c3a222e371bed4d790bf25b9d641c831d938a3 (patch)
tree2dfc50de6e0733e57efcd7a36ff56c4a692bd3af
parentAdded debian support from ubuntu policies (diff)
downloadmasterfiles-45c3a222e371bed4d790bf25b9d641c831d938a3.tar.gz
masterfiles-45c3a222e371bed4d790bf25b9d641c831d938a3.tar.bz2
masterfiles-45c3a222e371bed4d790bf25b9d641c831d938a3.zip
Fixed readme
-rw-r--r--README10
1 files changed, 6 insertions, 4 deletions
diff --git a/README b/README
index 9fd92b5..0ea3764 100644
--- a/README
+++ b/README
@@ -4,11 +4,12 @@ cfengine stdlib
The cfengine stdlib repo on legend is a repo initialized from the master branch of the official github masterfiles. To update, run:
git clone https://github.com/cfengine/masterfiles/ cfengine_stdlib
-cd cfengine_masterfiles/
+cd cfengine_stdlib/
git filter-branch --subdirectory-filter lib -- --all
git remote remove origin
git remote add legend gitolite3@10.1.0.254:cfengine_stdlib
git remote update
+git rebase legend/master
git push legend master
Then in your masterfiles repo:
@@ -20,12 +21,13 @@ cfengine modules
We have a second submodule for cfengine modules, also initialized from the master branch of the official github masterfiles. To update, run:
-git clone https://github.com/cfengine/masterfiles/ cfengine_stdlib
-cd cfengine_masterfiles/
+git clone https://github.com/cfengine/masterfiles/ cfengine_modules
+cd cfengine_modules/
git filter-branch --subdirectory-filter modules -- --all
git remote remove origin
git remote add legend gitolite3@10.1.0.254:cfengine_modules
git remote update
+git rebase legend/master
git push legend master
Then in your masterfiles repo:
@@ -34,6 +36,6 @@ git submodule update --init --recursive
Note
====
-Submodules where initialized with :
+Submodules were initialized with :
git submodule add gitolite3@10.1.0.254:cfengine_stdlib lib
git submodule add gitolite3@10.1.0.254:cfengine_modules modules