summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/scp.1
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2010-12-08 22:46:03 +0000
committermarkus <markus@openbsd.org>2010-12-08 22:46:03 +0000
commit521a7157f77211f0293676f49e344c392ef1d2ad (patch)
tree3e58d8c7e7803f4f4e06a83e8ed1dc5897f7b47c /usr.bin/ssh/scp.1
parentReset acb->xs to NULL before scsi_done if option DIAGNOSTIC. There seem to be (diff)
downloadwireguard-openbsd-521a7157f77211f0293676f49e344c392ef1d2ad.tar.xz
wireguard-openbsd-521a7157f77211f0293676f49e344c392ef1d2ad.zip
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 'usr.bin/ssh/scp.1')
-rw-r--r--usr.bin/ssh/scp.111
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 346e5e3114a..28bac5671ca 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/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