summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-20 16:48:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-20 16:48:31 -0400
commit6e1bc0bb44617af0792b5c18f0bb7cbad74ded9b (patch)
treecc7bef4c57957347b50e20ba7fa6ee21002f9e67
parent8cd1d9ed5ebf96d9e39116f63900ccd7be8d907e (diff)
parent1b85717dac05fc65042a8e053a3698a4b512b0d6 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/design/assistant/telehash.mdwn4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/design/assistant/telehash.mdwn b/doc/design/assistant/telehash.mdwn
index 01cbd1340..777bce646 100644
--- a/doc/design/assistant/telehash.mdwn
+++ b/doc/design/assistant/telehash.mdwn
@@ -75,7 +75,9 @@ Advantages:
(for example, if c-telehash development stalls and the nodejs version is
already usable)
* Potentially could be generalized to handle other similar protocols.
- Or even the xmpp code moved into it.
+ Or even the xmpp code moved into it. There could even be git-annex native
+ exchange protocols implemented in such a daemon to allow SSH-less
+ transfers.
* Security holes in telehash would not need to compromise the entire
git-annex. gathd could be sandboxed in one way or another.