]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - doc/setup.mdwn
comment
[git.ikiwiki.info.git] / doc / setup.mdwn
index e0ad0501b54214d7b0a4854b7ecea7dc5c81fc8d..e49d92d770f5a9d4cfade49285be5ada60350c3f 100644 (file)
@@ -128,23 +128,15 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
        to do the following, but this might be easiest:
 
                        REPOSITORY=~/wiki.git
+                       GIT_DIR=$REPOSITORY git --bare init --shared
                        cd $SRCDIR
                        git init
-                       echo .ikiwiki > .gitignore
+                       echo /.ikiwiki > .gitignore
                        git add .
-                       git commit -m'Initial commit'
-                       # if you expect $REPOSITORY to receive pushs from multiple
-                       # clones, then it is advisable to stop git performing
-                       # fast forwards -- this is to avoid overwriting the
-                       # remote ref and losing commits from there.
-                       git config receive.denyNonFastForwards true
-                       git config core.bare true
-                       mv .git $REPOSITORY
-                       mv .ikiwiki ..
-                       cd ..
-                       rm -r $SRCDIR
-                       git clone -l -s $REPOSITORY $SRCDIR
-                       mv .ikiwiki $SRCDIR
+                       git commit -m "initial commit"
+                       git remote add origin $REPOSITORY
+                       git config branch.master.merge refs/heads/master
+                       git push --all
 
        It is **paramount** that you **never** push to the Git repository in
        `$SRCDIR` ([this FAQ entry explains