diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/special_remotes/rsync.mdwn | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index ca6059f43..2e00728ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ git-annex (5.20140718) UNRELEASED; urgency=medium * New chunk= option to chunk files stored in special remotes. - Currently supported by: directory, S3, and all external and hook - special remotes. + Currently supported by: directory, S3, rsync, and all external + and hook special remotes. * Partially transferred files are automatically resumed when using chunked remotes! * The old chunksize= option is deprecated. Do not use for new remotes. @@ -21,6 +21,7 @@ git-annex (5.20140718) UNRELEASED; urgency=medium * Dropping an object from a bup special remote now deletes the git branch for the object, although of course the object's content cannot be deleted due to the nature of bup. + * -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400 diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn index b2a9d23f5..eb218b181 100644 --- a/doc/special_remotes/rsync.mdwn +++ b/doc/special_remotes/rsync.mdwn @@ -14,14 +14,14 @@ Or for using rsync over SSH These parameters can be passed to `git annex initremote` to configure rsync: +* `rsyncurl` - Required. This is the url or `hostname:/directory` to + pass to rsync to tell it where to store content. + * `encryption` - One of "none", "hybrid", "shared", or "pubkey". See [[encryption]]. * `keyid` - Specifies the gpg key to use for [[encryption]]. -* `rsyncurl` - Required. This is the url or `hostname:/directory` to - pass to rsync to tell it where to store content. - * `shellescape` - Optional. Set to "no" to avoid shell escaping normally done when using rsync over ssh. That escaping is needed with typical setups, but not with some hosting providers that do not expose rsynced @@ -30,6 +30,10 @@ These parameters can be passed to `git annex initremote` to configure rsync: quote (`'`) character. If that happens, you can run enableremote setting shellescape=no. +* `chunk` - Enables [[chunking]] when storing large files. + This is typically not a win for rsync, so no need to enable it. + But, it makes this interoperate with the [[directory]] special remote. + The `annex-rsync-options` git configuration setting can be used to pass parameters to rsync. |