aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorhttp://kerravonsen.dreamwidth.org/ <http://kerravonsen.dreamwidth.org/@web>2010-03-18 22:33:18 +0000
committerJoey Hess <joey@finch.kitenet.net>2010-03-18 22:33:18 +0000
commit9a6a28512025c91b7518d8c9b69678e124c44128 (patch)
tree4089fd799bb1a603d5553622a84ea0373b335e80 /doc
parentdddd6aa99055d8505f73e39b12f049633d9cb4c3 (diff)
downloadikiwiki-9a6a28512025c91b7518d8c9b69678e124c44128.tar
ikiwiki-9a6a28512025c91b7518d8c9b69678e124c44128.tar.gz
corrected the update-the-laptop-from-the-server section
Diffstat (limited to 'doc')
-rw-r--r--doc/tips/laptop_wiki_with_git.mdwn11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 85e26c729..857083325 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -68,5 +68,12 @@ 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.
+within the laptop's bare repository.
+
+To update the laptop from the server, add a section for the laptop to the config file of the server's bare repository:
+
+ [remote "laptop"]
+ fetch = +refs/*:refs/*
+ url = me@laptop:/path/to/bare/repository
+
+Then do a `git push laptop` from within the server's bare repository.