diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-11 15:52:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-11 15:52:34 -0400 |
| commit | e12daf3d982d6c78bd777ffa0a710d3d7cc801d8 (patch) | |
| tree | 7871dee3cce09725a994c1d1ca1d8d7e26b597a1 | |
| parent | 7df02fe9ff9c3e643379e56ce6a3d865ff57e4fb (diff) | |
updates, document using git post-merge hook since it's available now
| -rw-r--r-- | doc/tips/laptop_wiki_with_git.mdwn | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn index bb14f6d38..800d71316 100644 --- a/doc/tips/laptop_wiki_with_git.mdwn +++ b/doc/tips/laptop_wiki_with_git.mdwn @@ -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. |