diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-11 15:56:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-11 15:56:34 -0400 |
| commit | 0933fde58cd8907e1911aa8e410911e938cb1daa (patch) | |
| tree | 62c0b80efc5114900fb7fd9de555dfda8193d80e | |
| parent | d76c8aa0137ddab41d085cd573aaff20afaf776c (diff) | |
reword
| -rw-r--r-- | doc/tips/laptop_wiki_with_git.mdwn | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn index 800d71316..998ac7443 100644 --- a/doc/tips/laptop_wiki_with_git.mdwn +++ b/doc/tips/laptop_wiki_with_git.mdwn @@ -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: * 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 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 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. +can simply make a symlink `post-merge` hook pointing at the `post-update` +hook ikiwiki created. |