From nobody Thu Dec 14 20:02:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Srjtn754Lz53hJ3; Thu, 14 Dec 2023 20:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Srjtn6X6pz4Pct; Thu, 14 Dec 2023 20:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702584145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0RjFV1gOdWZ1PiZNxx2fTZWc4FOKDjNFQ+geD6ObJo0=; b=vTlKCXw76ZMZQ9d5msVJDJKWlW9GIGiNPDc0pYoj8IYHgxL6IllR6sKGGfCsqRyiYoPaCl QI2f2oRQ6jqnsw9d+GPRRMFEWMjerJdRRYNzaIjBgIWYu8iuaUKq7HeiAltEz2sBYKKz6W JJwZI8/RYeu8x/zf9AXD0dS3AUCEbnF6E7Og9pI2UBoEI2FD7O6BbqTuzvuPWr34HpteEs nZ6D+u0IShibdw/f/aAhWaUSf2gRzrPkcXunN57QD4OVjUDwelew6ZO45RK69q3ENhWISU XoLJ/Pvc41xJzLM3VbspwwNK2kGWa89GjG75nLamR/TVrAGG2WW4lsrNRyZTpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702584145; a=rsa-sha256; cv=none; b=gFoGEOuPby0GnyZCwbBtRMTYZ2FrOLdebgVLHvDiu4y2xVjE7iCKhP3Ek4ayLMY2GboNoH +coIstRR+UhySFsmwsMVLrXaVQJn9cg4PnAjwHbm94klIW/88WRORwrD7RVL15nmumXRvV RifqE13oKA8jFxPjXri8LS2CpkwxeHmKFoC6ML+BxqI02RXDa1G3D3T7uATIwIJtUBkyFD NBULVTYhihSxzu60zBeFsmyWJzeoxdEEUXtQlLrgCPE0m4/57FzvBo0wJy6p6OwQPbV/yn g5leg6Nen/N3ZohRXyUCRguvGNtRNHO7Nx6ay3d0YbtQIZIMPVcoZKGJ901pIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702584145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0RjFV1gOdWZ1PiZNxx2fTZWc4FOKDjNFQ+geD6ObJo0=; b=pFbRCFatPdPpL5Ax34X6IyV8I+SxjRnHBZn5mVtdFNeLQ8IseunFWZca0q09e+3HadD5QK RQBWvoANwuWBytSVqca/aGx0HKqtPu9vowjrOvbVkuRPYTjxsueR6F0eqRtXNqnd3xNlpi IDiuatDZjSjpdf+zgRQGQwi407HqlxzZ85jT8XaYM6WXqAO6CVbITjObCCTu4Jc2Bd3H4/ MDfbWsTsn+LUM39hvWeMIBngCFkZwzH7HN4Dw/mCPgb1iE3RKIyFUwlzCtfQtQCvvQhjbX Q4MYcY7vCFKOEPCk624esKo6Q8W8feLx4JN0v5paeAlWbDo/7i1lGzyZHUskHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Srjtn5cnszhHC; Thu, 14 Dec 2023 20:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEK2PoV017948; Thu, 14 Dec 2023 20:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEK2Pfi017945; Thu, 14 Dec 2023 20:02:25 GMT (envelope-from git) Date: Thu, 14 Dec 2023 20:02:25 GMT Message-Id: <202312142002.3BEK2Pfi017945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 53fc8e190241 - main - cp: Move the -N flag in the manual page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53fc8e190241233d94e183f8a39ec39f2154dfa8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=53fc8e190241233d94e183f8a39ec39f2154dfa8 commit 53fc8e190241233d94e183f8a39ec39f2154dfa8 Author: Dag-Erling Smørgrav AuthorDate: 2023-12-14 20:02:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-14 20:02:06 +0000 cp: Move the -N flag in the manual page. This accidentally got left out of 0f4467ce444b. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, allanjude Differential Revision: https://reviews.freebsd.org/D43067 --- bin/cp/cp.1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index 32e6fe295b35..66d4ab04f5d3 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 7, 2023 +.Dd December 14, 2023 .Dt CP 1 .Os .Sh NAME @@ -88,10 +88,6 @@ option is specified, symbolic links on the command line are followed. If the .Fl R option is specified, all symbolic links are followed. -.It Fl N -When used with -.Fl p , -suppress copying file flags. .It Fl P No symbolic links are followed. This is the default if the @@ -159,6 +155,10 @@ or options.) .It Fl l Create hard links to regular files in a hierarchy instead of copying. +.It Fl N +When used with +.Fl p , +suppress copying file flags. .It Fl n Do not overwrite an existing file. (The