From owner-dev-commits-doc-all@freebsd.org Thu Jun 3 13:57:16 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 23A2D63A0DC for ; Thu, 3 Jun 2021 13:57:16 +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 4FwnWw0Wvpz3LmW; Thu, 3 Jun 2021 13:57:16 +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 EA3BD31CB; Thu, 3 Jun 2021 13:57:15 +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 153DvFxR056831; Thu, 3 Jun 2021 13:57:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 153DvFO4056830; Thu, 3 Jun 2021 13:57:15 GMT (envelope-from git) Date: Thu, 3 Jun 2021 13:57:15 GMT Message-Id: <202106031357.153DvFO4056830@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: e22642d10e - main - committers-guide: pull request landing tweaks. 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: e22642d10ef896da9a08ac07a264f290b28b934c 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: Thu, 03 Jun 2021 13:57:16 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=e22642d10ef896da9a08ac07a264f290b28b934c commit e22642d10ef896da9a08ac07a264f290b28b934c Author: Warner Losh AuthorDate: 2021-06-03 13:55:34 +0000 Commit: Warner Losh CommitDate: 2021-06-03 13:55:34 +0000 committers-guide: pull request landing tweaks. Clarify that only closing the pull request resuires a GitHub account. All the other steps can proceed without one. Also, include --push-option=confirm-author in the push because pull requests will have a different author than the committer and this instructs the src pre-commit hooks to allow the commit through. Sponsored by: Netflix --- documentation/content/en/articles/committers-guide/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index f3c63a4943..1767095908 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2243,7 +2243,7 @@ When adjusting the message, add `Pull Request: https://github.com/freebsd-src/pu % git checkout main % git merge --ff-only staging -% git push freebsd +% git push freebsd --push-option=confirm-author .... [.procedure] @@ -2261,7 +2261,7 @@ For complicated pull requests that have multiple commits with conflicts, follow This will also work when bringing branches developed elsewhere into the local tree for committing. ==== Once finished with the pull request, close it using GitHub's web interface. -If the changes are fetched with https, this last step is the only one requiring a GitHub account. +It is worth noting that if your `github` origin uses `https://`, the only step you'll need a GitHub account for is closing the pull request. [[vcs-history]] == Version Control History