diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-03-19 13:39:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-03-19 13:39:51 -0400 |
| commit | a2e387d64be7c68400f5c80bcb7da973ed05fa3d (patch) | |
| tree | f0412f1f95920a5e2ff3c06566bfd49a76b09f3e /doc/tips | |
| parent | cbf269eee29a66e1350e5553f38eee5b4683be8a (diff) | |
| parent | 96a54b35fe2cdcdc1450b5d38c80e7b27b428c14 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/tips')
| -rw-r--r-- | doc/tips/laptop_wiki_with_git.mdwn | 11 |
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. |