From owner-dev-commits-doc-all@freebsd.org  Wed Jun 16 14:52:56 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7B44663CE8
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed, 16 Jun 2021 14:52:56 +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 4G4p885xNyz4Xmk;
 Wed, 16 Jun 2021 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 B47661DC12;
 Wed, 16 Jun 2021 14:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15GEquw5087721;
 Wed, 16 Jun 2021 14:52:56 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15GEqu08087720;
 Wed, 16 Jun 2021 14:52:56 GMT (envelope-from git)
Date: Wed, 16 Jun 2021 14:52:56 GMT
Message-Id: <202106161452.15GEqu08087720@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 8dd6ba22af - main - committers-guide: fix thinko: this should be
 --ff-only to match elsewhere
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 8dd6ba22afde42ad1da8b48b8b11414378e0248c
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-doc-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the doc repository
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jun 2021 14:52:57 -0000

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=8dd6ba22afde42ad1da8b48b8b11414378e0248c

commit 8dd6ba22afde42ad1da8b48b8b11414378e0248c
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-06-16 14:52:14 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-06-16 14:52:14 +0000

    committers-guide: fix thinko: this should be --ff-only to match elsewhere
---
 documentation/content/en/articles/committers-guide/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 6dffae7c69..44360132c1 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -744,7 +744,7 @@ It is important to start rebasing operations with a clean tree (Git usually requ
 [source,shell]
 ....
 % git checkout main
-% git pull --no-ff
+% git pull --ff-only
 % git rebase -i main no-color-ls
 ....