diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index fdd909c53..0b7272b93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ git-annex (5.20140128) UNRELEASED; urgency=medium meantime. * Added ways to configure rsync options to be used only when uploading or downloading from a remote. Useful to eg limit upload bandwidth. + * Document in man page that sshcaching uses ssh ControlMaster. + Closes: #737476 -- Joey Hess <joeyh@debian.org> Tue, 28 Jan 2014 13:57:19 -0400 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` |