summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-02 19:27:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-02 19:27:47 -0400
commite570a4ebf5b9af092bb92f1bc9d06a08bffbd073 (patch)
tree359101a6d74add29b868b429d16b65161a6f8705 /doc/git-annex.mdwn
parentc6a029d6e685689c99cf1786fc80e3d9ed1d3b42 (diff)
Document in man page that sshcaching uses ssh ControlMaster. Closes: #737476
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index ef935921b..90774a74b 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1214,7 +1214,8 @@ Here are all the supported configuration settings.
* `annex.sshcaching`
- By default, git-annex caches ssh connections
+ By default, git-annex caches ssh connections using ssh's
+ ControlMaster and ControlPersist settings
(if built using a new enough ssh). To disable this, set to `false`.
* `annex.alwayscommit`