From: http://kerravonsen.dreamwidth.org/ <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 18 Mar 2010 22:33:18 +0000 (+0000)
Subject: corrected the update-the-laptop-from-the-server section
X-Git-Tag: 3.20100403~140^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a6a28512025c91b7518d8c9b69678e124c44128;p=ikiwiki.git

corrected the update-the-laptop-from-the-server section
---

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.