From owner-dev-commits-doc-all@freebsd.org Wed Jun 16 14:55:01 2021 Return-Path: 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 34172663CEB for ; Wed, 16 Jun 2021 14:55:01 +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 4G4pBY06GCz4Xmt; Wed, 16 Jun 2021 14:55:01 +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 DC5501DC81; Wed, 16 Jun 2021 14:55:00 +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 15GEt0iF088072; Wed, 16 Jun 2021 14:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15GEt05G088071; Wed, 16 Jun 2021 14:55:00 GMT (envelope-from git) Date: Wed, 16 Jun 2021 14:55:00 GMT Message-Id: <202106161455.15GEt05G088071@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 3da6865c14 - main - committers-guide: git always requires a clean tree to rebase. 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: 3da6865c14b60d0a0d94e1e66158c5bfb9f11e96 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 14:55:01 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=3da6865c14b60d0a0d94e1e66158c5bfb9f11e96 commit 3da6865c14b60d0a0d94e1e66158c5bfb9f11e96 Author: Warner Losh AuthorDate: 2021-06-16 14:54:04 +0000 Commit: Warner Losh CommitDate: 2021-06-16 14:54:04 +0000 committers-guide: git always requires a clean tree to rebase. Remove confusing word. Sponsored by: Netflix --- 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 44360132c1..e27ffcfe8e 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -739,7 +739,7 @@ I have opted to do it on the commit command line, but you can also do it with 'g When it is time to bring in a new version, it is almost the same as w/o the branches. You would update like you would above, but there is one extra command before you update, and one after. The following assumes you are starting with an unmodified tree. -It is important to start rebasing operations with a clean tree (Git usually requires this). +It is important to start rebasing operations with a clean tree (Git requires this). [source,shell] ....