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 0fe09b230a47e0657572177e8c24cde9f0a22064..101ca74dfe4f01f0db7c312a3889b3b84a3ed3d6 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -9,6 +9,7 @@ they import. --Ethan
 > I've switched to a different method that preserves .ikiwiki, w/o checking
 > it in. --[[Joey]]
 
+----
 
 These instructions should probably show how to use a bare Git repository
 (`GIT_DIR=somewhere.git git-init-db`) rather than a repository with a full
@@ -26,6 +27,44 @@ directory back into the wiki's working copy directory, isn't it? --[[tschwinge]]
 
 >> Either you do it or I'll do it somewhen soon.  --[[tschwinge]]
 
+----
+
 Curious as to why support for CVS is not built in. --[[Luther]]
 
-> See [[todo/CVS_backend|todo/CVS_backend]], but you might consider switching to a better version control system. --[[JoshTriplett]]
\ No newline at end of file
+> See [[todo/CVS_backend|todo/CVS_backend]], but you might consider switching to a better version control system. --[[JoshTriplett]]
+
+----
+
+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 $REPOSITORY $SRCDIR
+       cd $SRCDIR
+       echo /.ikiwiki > .gitignore
+       mv $SRCDIR.old/* $SRCDIR.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