summaryrefslogtreecommitdiffstats
path: root/scp.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-06 12:40:30 +0100
committerDamien Miller <djm@mindrot.org>2011-01-06 12:40:30 +0100
commitf12114366b4ffcd34e3a638dd187f29ac03fbdbd (patch)
tree56fffcf6943140aa7fde6c54c5021e873aa19c25 /scp.1
parent - (djm) [configure.ac Makefile.in] Use mandoc as preferred manpage (diff)
downloadopenssh-f12114366b4ffcd34e3a638dd187f29ac03fbdbd.tar.xz
openssh-f12114366b4ffcd34e3a638dd187f29ac03fbdbd.zip
- markus@cvs.openbsd.org 2010/12/08 22:46:03
[scp.1 scp.c] add a new -3 option to scp: Copies between two remote hosts are transferred through the local host. Without this option the data is copied directly between the two remote hosts. ok djm@ (bugzilla #1837)
Diffstat (limited to 'scp.1')
-rw-r--r--scp.111
1 files changed, 8 insertions, 3 deletions
diff --git a/scp.1 b/scp.1
index 346e5e311..28bac5671 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.54 2010/11/18 15:01:00 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.55 2010/12/08 22:46:03 markus Exp $
.\"
-.Dd $Mdocdate: November 18 2010 $
+.Dd $Mdocdate: December 8 2010 $
.Dt SCP 1
.Os
.Sh NAME
@@ -19,7 +19,7 @@
.Sh SYNOPSIS
.Nm scp
.Bk -words
-.Op Fl 1246BCpqrv
+.Op Fl 12346BCpqrv
.Op Fl c Ar cipher
.Op Fl F Ar ssh_config
.Op Fl i Ar identity_file
@@ -75,6 +75,11 @@ to use protocol 1.
Forces
.Nm
to use protocol 2.
+.It Fl 3
+Copies between two remote hosts are transferred through the local host.
+Without this option the data is copied directly between the two remote
+hosts.
+Note that this options disables the progress meter.
.It Fl 4
Forces
.Nm