aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-05 17:43:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-05 17:43:17 -0400
commita4667e3e8cb7fae50b0c2cb8bc1a46df0b289b6c (patch)
tree9f75d066b025e99f7015818ccbe143d70b5bbae7 /doc/git-annex.mdwn
parentdedc9790ef60b0965c0c34acd080ef8d4906e07a (diff)
finished XMPP pairing!
This includes keeping track of which buddies we're pairing with, to know which PairAck are legitimate.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index d5f5da464..33a209e76 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -881,6 +881,11 @@ Here are all the supported configuration settings.
Used to identify Amazon S3 special remotes.
Normally this is automaticaly set up by `git annex initremote`.
+* `remote.<name>.annex-xmppaddress`
+
+ Used to identify the XMPP address of a Jabber buddy.
+ Normally this is set up by the git-annex assistant when pairing over XMPP.
+
# CONFIGURATION VIA .gitattributes
The key-value backend used when adding a new file to the annex can be