aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-03-19 13:40:02 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-03-19 13:40:02 -0400
commitaf83b4c5f576633c03c157a67994af6bfaff617a (patch)
tree87f6b335d2ebcd35de2cb1e7a31c5b38c6f55cd7
parenta2e387d64be7c68400f5c80bcb7da973ed05fa3d (diff)
downloadikiwiki-af83b4c5f576633c03c157a67994af6bfaff617a.tar
ikiwiki-af83b4c5f576633c03c157a67994af6bfaff617a.tar.gz
Revert "corrected the update-the-laptop-from-the-server section"
No, we don't normally push from servers to laptops. Because most laptops do not have publicly accessible IP addresses, for one thing. Also because there's really no reason to ssh to the server from your laptop in order to update the laptop when you can just pull.
-rw-r--r--doc/tips/laptop_wiki_with_git.mdwn11
1 files changed, 2 insertions, 9 deletions
diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 857083325..85e26c729 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -68,12 +68,5 @@ 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.
-
-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.
+within the laptop's bare repository, and likewise do a `git pull` to update
+the laptop from the server.