summaryrefslogtreecommitdiff
path: root/doc/tips/laptop_wiki_with_git_extended.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-27 10:01:58 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-27 10:01:58 +0200
commitf398ad035b973608d380c9939ea845d8e2a0cdc2 (patch)
tree1ba1a0c94e375ab8ed609eaa57a542c6b87de5a8 /doc/tips/laptop_wiki_with_git_extended.mdwn
parent958e5735c946263a111420fe47abe58782581e8c (diff)
parent6d213a0c739d5b34357b01a616f99197eeba6ad9 (diff)
Merge branch 'master' of git://git.ikiwiki.info
Diffstat (limited to 'doc/tips/laptop_wiki_with_git_extended.mdwn')
-rw-r--r--doc/tips/laptop_wiki_with_git_extended.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tips/laptop_wiki_with_git_extended.mdwn b/doc/tips/laptop_wiki_with_git_extended.mdwn
index 620370218..0666da450 100644
--- a/doc/tips/laptop_wiki_with_git_extended.mdwn
+++ b/doc/tips/laptop_wiki_with_git_extended.mdwn
@@ -10,7 +10,7 @@ a bare repo on `gitserver`, and clone that to a workingdir on gitserver.
Next create a setup file for the laptop with
gitorigin_branch=> "",
- wrapper => "/working/dir/.git/hooks/post-commit",
+ git_wrapper => "/working/dir/.git/hooks/post-commit",
At this point, assuming you followed page above, and not my hasty summary,
@@ -21,7 +21,7 @@ a bare repo on `gitserver`, and clone that to a workingdir on gitserver.
2. Now create a setup file for the server (I call it server.setup).
gitorigin_branch=> "origin",
- wrapper => "/repo/wiki.git/hooks/post-update.ikiwiki"
+ git_wrapper => "/repo/wiki.git/hooks/post-update.ikiwiki"
Note the non-standard and bizzare name of the hook.