X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/37c6116d6aab664b5d6d4cb1f90f4c6bf8ed2558..d7cf9b6fd98aa0f202ec1f4ac9a8137dbd0a1c47:/doc/setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 13f8500c4..f5dd8832e 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -128,25 +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
 			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
@@ -156,7 +146,10 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 	`ssh`.
 
 	If at any point you commit changes in `$SRCDIR`, make sure to `git
-	push` them to the `$REPOSITORY`.
+	push` them to the `$REPOSITORY`. ikiwiki will do this automatically
+	for any changes made via the web.
+
+	Finally, see [[Git_pitfalls]] if you experience problems.
    """]]
 
    [[toggle id=tla text="TLA"]]
@@ -216,7 +209,7 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
    you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
    subversion. Uncomment the block for the wrapper for your revision
    control system, and configure the wrapper path in that block
-   appropriately (for Git, it should be `$REPO/hooks/post-update`).
+   appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`).
 
    Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more.
    Now you should be able to edit files in $SRCDIR, and use your revision