X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/09e69896395f58faee35b694d26a69dfa26cb36b..275c23c7e894f9024fb9759e16839f29c7796e0c:/doc/rcs/git.mdwn diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index c82adbd04..a5de19e3e 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -8,7 +8,7 @@ the Linux kernel. Ikiwiki supports storing a wiki in git. Ikiwiki can run as a git `post-update` hook to update a wiki whenever commits come in. When running as a [[cgi]], ikiwiki automatically commits edited pages, and uses the -git history to generate the [[RecentChanges]] page. +git history to generate the [[• Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page. Normally you can just follow the instructions in [[setup]] to create the git repositories and get started. To understand the details, read on. @@ -108,13 +108,13 @@ is the normal behaviour of ikiwiki, set the configuration of the local wiki: git_wrapper => "/working/dir/.git/hooks/post-commit", Then just committing should refresh the private ikiwiki on the local -host. Now just run `ikiwiki -setup localwiki.setup -gettime` and -you should be good to go. (You only need the slow `-gettime` option +host. Now just run `ikiwiki --setup localwiki.setup --gettime` and +you should be good to go. (You only need the slow `--gettime` option the first time you run setup.) Use standard git commands to handle pulling from and pushing to the server. **Note**: After pulling changes from the bare root repository, you will need to manually update the local wiki, with a command such as `ikiwiki --setup localwiki.setup -refresh`. You could use git's `post-merge` hook +--setup localwiki.setup --refresh`. You could use git's `post-merge` hook to automate that command. ## Using ikiwiki with Gerrit