urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates, document using git post-merge hook since it's available now

master
Joey Hess 2008-09-11 15:52:34 -04:00
parent 7df02fe9ff
commit e12daf3d98
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/tips/laptop_wiki_with_git.mdwn
View File

@ -15,7 +15,8 @@ for setting up ikiwiki with git.
Next, `git clone` the source (`$REPOSITORY`, not `$SRCDIR`)
from the server to the laptop.
Now, set up a web server on your laptop, if it doesn't already have one.
Now, set up a [[web_server|apache_cgi]] on your laptop, if it doesn't
already have one.
Now you need to write a setup file for ikiwiki on the laptop. Mostly this
is standard, but a few special settings are needed:
@ -42,8 +43,7 @@ run setup.)
Use standard git commands to handle pulling from and pushing to the server.
Note: Currently, after pulling changes, you will need to manually update
the wiki, with a command such as `ikiwiki -setup wiki.setup -refresh`. This
is because git 1.5.4 doesn't have a hook that is run locally after pulling
changes. Newer versions of git will have a `post-merge` hook that should
work for this purpose.
Note that if changes are pulled from the server, you will need to manually
update the wiki, with a command such as `ikiwiki -setup wiki.setup -refresh`.
If you'd like it to automatically update when changes are merged in, you
can simply symlink the post-commit hook to a post-merge hook.