aboutsummaryrefslogtreecommitdiff
path: root/sshfs.1.in
diff options
context:
space:
mode:
authorBenjamin Fleischer <fleiben@gmail.com>2013-08-03 11:50:50 +0200
committerBenjamin Fleischer <fleiben@gmail.com>2013-08-03 11:50:50 +0200
commit990f30d767063c086710ea52ad2c70237338434a (patch)
treed1fd89ef6f70bc54dea3aece4f96a42b194c0da3 /sshfs.1.in
parentd04fd55128d96a3f3de039c9df162211f482a0aa (diff)
parent61524cd1e85d076fe09f04ddd2871e026e1360cd (diff)
downloadsshfs-990f30d767063c086710ea52ad2c70237338434a.tar
sshfs-990f30d767063c086710ea52ad2c70237338434a.tar.gz
sshfs-990f30d767063c086710ea52ad2c70237338434a.tar.bz2
sshfs-990f30d767063c086710ea52ad2c70237338434a.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: ChangeLog configure.ac sshfs.1.in sshfs.c
Diffstat (limited to 'sshfs.1.in')
-rw-r--r--sshfs.1.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/sshfs.1.in b/sshfs.1.in
index aef99fd..0ba406d 100644
--- a/sshfs.1.in
+++ b/sshfs.1.in
@@ -153,6 +153,9 @@ directly connect to PORT bypassing ssh
\fB\-o\fR slave
communicate over stdin and stdout bypassing network
.TP
+\fB\-o\fR slave
+communicate over stdin and stdout bypassing network
+.TP
\fB\-o\fR transform_symlinks
transform absolute symlinks to relative
.TP