web commit by http://ygingras.livejournal.com/: poll vote (It's too slow!)

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index e0ad0501b54214d7b0a4854b7ecea7dc5c81fc8d..364b704fb27f3215901085262fed3eccb16cec08 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -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
@@ -155,6 +147,8 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 
        If at any point you commit changes in `$SRCDIR`, make sure to `git
        push` them to the `$REPOSITORY`.
+
+       Finally, see [[Git_pitfalls]] if you experience problems.
    """]]
 
    [[toggle id=tla text="TLA"]]
@@ -214,7 +208,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