diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
| commit | 33e7dd2e0b756270cb51d1ed574cbe4b8173c7cd (patch) | |
| tree | 0e9ff04c04c33cd1ba45171983d1b9f4d92cac60 /doc/special_remotes | |
| parent | 2d7b57270e628994483495159d2be715c8f9531b (diff) | |
| parent | 49475bb89542e92c6f466425f29cd0640a8e80f4 (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
Remote/S3.hs
Diffstat (limited to 'doc/special_remotes')
| -rw-r--r-- | doc/special_remotes/rsync.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn index eb218b181..628d2e8cb 100644 --- a/doc/special_remotes/rsync.mdwn +++ b/doc/special_remotes/rsync.mdwn @@ -2,12 +2,12 @@ This special remote type rsyncs file contents to somewhere else. Setup example: - # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync keyid=joey@kitenet.net + # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync keyid=joey@kitenet.net encryption=shared # git annex describe myrsync "rsync server" Or for using rsync over SSH - # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync keyid=joey@kitenet.net + # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync keyid=joey@kitenet.net encryption=shared # git annex describe myrsync "rsync server" ## configuration |