summaryrefslogtreecommitdiff
path: root/doc/setup
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
parent55bf5afa0b7d219bbec1f3eaecd56ef0e4af43d8 (diff)
simplified git setup instructions w/help from madduck
Diffstat (limited to 'doc/setup')
-rw-r--r--doc/setup/discussion.mdwn33
1 files changed, 0 insertions, 33 deletions
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