X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/230b7d4d6e1a87bc5e18eb6c6155cc45957cff70..b0bdc5d9f2f1fa804b340734a7a10620cbe21ad9:/doc/rcs/git.mdwn diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 1b66493dd..1aa54cf24 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -39,10 +39,10 @@ repositories: git does not support pushing to a repository that has a working directory. This is called _repository_ in [[ikiwiki-makerepo]]'s manual page. This bare repository has a `post-update` hook - that either is or calls ikiwiki's git wrapper, which changes to the + that either is or calls ikiwiki's `git_wrapper`, which changes to the working directory for ikiwiki, does a `git pull`, and refreshes ikiwiki to regenerate the wiki with any new content. The [[setup]] page describes - how to do this. + how to do this, but note, if you are importing from an existing git repository, that ikiwiki will not create the `git_wrapper` unless its path is explicitely set in your `.setup` file. * The second repository is a clone of the bare root repository, and has a working tree which is used as ikiwiki's srcdir for compiling @@ -117,7 +117,8 @@ usernames of the untrusted committers. Note that when the `pre-receive` hook is checking incoming changes, it ignores the git authorship information, and uses the username of the unix -user who made the commit. Then tests including the `locked_pages` [[PageSpec]] +user who made the commit. Then tests including the `locked_pages` +[[ikiwiki/PageSpec]] are checked to see if that user can edit the pages in the commit. You can even set up an [[anonymous_user|tips/untrusted_git_push]], to allow