summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2014-12-16 23:22:46 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2014-12-16 23:22:46 -0400
commit7dcad535f2db4b1e5f89ae2d59496fd86bba977c (patch)
tree7bc91205119c531fe29d1352cdf52719ebed11a7 /doc/git-annex.mdwn
parent4556a7ce6c079f27f8f02b945829ad8d41dc5881 (diff)
Added bittorrent special remote
addurl behavior change: When downloading an url ending in .torrent, it will download files from bittorrent, instead of the old behavior of adding the torrent file to the repository. Added Recommends on aria2 and bittornado | bittorrent. This commit was sponsored by Asbjørn Sloth Tønnesen.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 7ccb36b5d..8a2633e15 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1728,6 +1728,10 @@ Here are all the supported configuration settings.
Options to pass to quvi when using it to find the url to download for a
video.
+* `annex.aria-torrent-options`
+
+ Options to pass to aria2c when using it to download a torrent.
+
* `annex.http-headers`
HTTP headers to send when downloading from the web. Multiple lines of