web commit by http://madduck.myopenid.com/: alternate git setup suggestion.

[ikiwiki.git] / doc / setup / discussion.mdwn

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index e1617aac6b2d9df678e7caa84caa9e0b95982efc..101ca74dfe4f01f0db7c312a3889b3b84a3ed3d6 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -38,15 +38,33 @@ Curious as to why support for CVS is not built in. --[[Luther]]
 On the git setup instuctions, I wonder if this wouldn't work as well and be
 simpler? --[[Joey]]
 
+       REPOSITORY=~/wiki.git
        mkdir $REPOSITORY
        cd $REPOSITORY
        git --bare init --shared
        mv $SRCDIR $SRCDIR.old
-       git clone -l -s $REPOSITORY $SRCDIR
+       git clone $REPOSITORY $SRCDIR
        cd $SRCDIR
        echo /.ikiwiki > .gitignore
        mv $SRCDIR.old/* $SRCDIR.old/.* .
-       rmdir $SRDDIR.old
+       rmdir $SRCDIR.old
        git add .
        git commit -m "initial commit"
        git push $REPOSITORY master
+
+[[madduck]]: I'd say this instead:
+
+       mkdir $REPOSITORY
+       cd $REPOSITORY
+       git --bare init --shared
+       mv $SRCDIR $SRCDIR.old
+       cd $SRCDIR
+       git init
+       echo /.ikiwiki > .gitignore
+       mv $SRCDIR.old/* $SRCDIR.old/.* .
+       rmdir $SRCDIR.old
+       git add .
+       git commit -m "initial commit"
+       git remote add origin $REPOSITORY
+       git config branch.master.merge refs/heads/master
+       git push --all
\ No newline at end of file