diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-05 15:59:42 -0500 |
| commit | f92505d78b82c6ac146e43054ebd12441575a602 (patch) | |
| tree | 2897a21c04f473ee3100a6a59ccce6336a1f7692 /doc/rcs/git.mdwn | |
| parent | fbe2ab4419e086ff84991bf25f1549aaabc5143b (diff) | |
| parent | 11f4942d68f3276bfdc4688e4091e559f9481874 (diff) | |
Merge branch 'master' into prefix-directives
Diffstat (limited to 'doc/rcs/git.mdwn')
| -rw-r--r-- | doc/rcs/git.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 0353d1535..f97131742 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -22,7 +22,7 @@ but it works the best for typical ikiwiki use. and git. It is **paramount** that you **never** push to the non-bare repository -([this FAQ entry explains why](http://git.or.cz/gitwiki/GitFaq#head-b6a3d85f677763313159eb39f7dbf4579d4ee28b)). +([this FAQ entry explains why](http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73)). Instead, if you want to work on the wiki from a remote machine, clone the bare repository, using either the `git` transport (if available), or `ssh`. @@ -39,7 +39,7 @@ should go to the bare repository, which has a `post-update` hook that uses ikiwiki to pull the changes to the srcdir. One setup that will work is to put all committers in a group (say, -ikiwiki), and use permissions to allow that group to commit to the bare git +"ikiwiki"), and use permissions to allow that group to commit to the bare git repository. Make both the post-update hook and ikiwiki.cgi be setgid to the group, as well as suid to the user who admins the wiki. The `wrappergroup` [[setup_file_option|usage]] can be used to make the wrappers |