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

reword

master
Joey Hess 2008-09-11 15:56:34 -04:00
parent d76c8aa013
commit 0933fde58c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/tips/laptop_wiki_with_git.mdwn
View File

@ -22,7 +22,8 @@ Now you need to write a setup file for ikiwiki on the laptop. Mostly this
is standard, but a few special settings are needed: is standard, but a few special settings are needed:
* Configure a cgi wrapper as usual, but configure the git wrapper to * Configure a cgi wrapper as usual, but configure the git wrapper to
be written to the `post-commit` hook of the git clone. be written to the `post-commit` hook of the git clone, rather than the
usual `post-update` hook.
* By default, ikiwiki pulls and pushes from `origin`. This shouldn't be * By default, ikiwiki pulls and pushes from `origin`. This shouldn't be
done on the laptop, because the origin may not be accessible (when the done on the laptop, because the origin may not be accessible (when the
@ -46,4 +47,5 @@ Use standard git commands to handle pulling from and pushing to the server.
Note that if changes are pulled from the server, you will need to manually 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`. 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 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. can simply make a symlink `post-merge` hook pointing at the `post-update`
hook ikiwiki created.