aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 14:48:51 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 15:01:55 -0400
commit42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch)
tree78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /doc/git-annex.mdwn
parent34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff)
parent3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff)
Merge branch 'master' into no-xmpp
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index d71076087..ca1ac3620 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -212,6 +212,12 @@ subdirectories).
See [[git-annex-enableremote]](1) for details.
+* `enable-tor`
+
+ Sets up tor hidden service.
+
+ See [[git-annex-enable-tor]](1) for details.
+
* `numcopies [N]`
Configure desired number of copies.
@@ -379,6 +385,12 @@ subdirectories).
See [[git-annex-repair]](1) for details.
+* `p2p`
+
+ Configure peer-2-Peer links between repositories.
+
+ See [[git-annex-p2p]](1) for details.
+
# QUERY COMMANDS
* `find [path ...]`