diff options
Diffstat (limited to 'doc/tips')
| -rw-r--r-- | doc/tips/laptop_wiki_with_git.mdwn | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn index e85f7d12b..85e26c729 100644 --- a/doc/tips/laptop_wiki_with_git.mdwn +++ b/doc/tips/laptop_wiki_with_git.mdwn @@ -10,7 +10,7 @@ version on the laptop, perhaps while offline. You can browse and edit the wiki using a local web server. When you're ready, you can manually push the changes to the main wiki on the server. -## Original approach +## simple clone approach First, set up the wiki on the server, if it isn't already. Nothing special needs to be done here, just follow the regular instructions in [[setup]] @@ -54,13 +54,19 @@ If you'd like it to automatically update when changes are merged in, you can simply make a symlink `post-merge` hook pointing at the `post-update` hook ikiwiki created. -## Alternative Approach +## bare mirror approach As above, set up a normal ikiwiki on the server, with the usual bare repository. Next, `git clone --mirror server:/path/to/bare/repository` -This will be used as the $REPOSITORY on the laptop. Then you can follow the instructions in [[setup by hand|/setup/byhand]] as per a normal ikiwiki installation. -This means that you can clone from the local bare repository as many times as you want (thus being able to have a repository which is used by the ikiwiki CGI, and another which you can use for updating via git). +This will be used as the $REPOSITORY on the laptop. Then you can follow +the instructions in [[setup by hand|/setup/byhand]] as per a normal ikiwiki +installation. This means that you can clone from the local bare repository +as many times as you want (thus being able to have a repository which is +used by the ikiwiki CGI, and another which you can use for updating via +git). -When you want to update the server from the laptop, do a `git push` from within the laptop's bare repository, and likewise do a `git pull` to update the laptop from the server. +When you want to update the server from the laptop, do a `git push` from +within the laptop's bare repository, and likewise do a `git pull` to update +the laptop from the server. |