aboutsummaryrefslogtreecommitdiff
path: root/doc/setup.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-10-03 18:58:23 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-10-03 18:58:23 +0000
commit5118b911cc44880a44b0fae936fa9872373dbd7c (patch)
tree3e7bf3d16113ef5fbd1bb5859337ec6c427680bb /doc/setup.mdwn
parent55bf5afa0b7d219bbec1f3eaecd56ef0e4af43d8 (diff)
downloadikiwiki-5118b911cc44880a44b0fae936fa9872373dbd7c.tar
ikiwiki-5118b911cc44880a44b0fae936fa9872373dbd7c.tar.gz
simplified git setup instructions w/help from madduck
Diffstat (limited to 'doc/setup.mdwn')
-rw-r--r--doc/setup.mdwn22
1 files changed, 7 insertions, 15 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