From 5118b911cc44880a44b0fae936fa9872373dbd7c Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 3 Oct 2007 18:58:23 +0000
Subject: [PATCH] simplified git setup instructions w/help from madduck

---
 doc/setup.mdwn            | 22 +++++++---------------
 doc/setup/discussion.mdwn | 33 ---------------------------------
 2 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 13f8500c4..98806b583 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -128,25 +128,17 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 	to do the following, but this might be easiest:
 
 			REPOSITORY=~/wiki.git
+			mkdir $REPOSITORY
+			cd $REPOSITORY
+			git --bare init --shared
 			cd $SRCDIR
 			git init
 			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 only accept 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
-			# we want to preserve the current .ikiwiki directory,
-			# so temporarily move it to a safe location
-			mv .ikiwiki ../ikiwiki.sv
-			cd ..
-			rm -r $SRCDIR
-			git clone -l -s $REPOSITORY $SRCDIR
-			mv ikiwiki.sv $SRCDIR/.ikiwiki
+			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
diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 6ba0ec18b..a16553d7b 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -32,36 +32,3 @@ directory back into the wiki's working copy directory, isn't it? --[[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]]
-
-----
-
-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
-	cd $SRCDIR
-	git init
-	echo /.ikiwiki > .gitignore
-	git add .
-	git commit -m "initial commit"
-	git remote add origin $REPOSITORY
-	git config branch.master.merge refs/heads/master
-	git push --all
-- 
2.32.0.93.g670b81a890