From nobody Sun Jan 29 02:45:37 2023 X-Original-To: dev-commits-doc-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 4P4Fzj5jmFz3c2YN for ; Sun, 29 Jan 2023 02:45:37 +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 4P4Fzj5BQgz3xv0; Sun, 29 Jan 2023 02:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674960337; 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=2eXzspnSPDKxoH76FzSQYQ86/IV4gLJziOMaq/goYAA=; b=rvQS1uh7UjCMoZigavH2ljGjlCpRfd1wZG+LkXpxjawXkWM/5HGtRNxfzkuyG2wYtYYo5B hImrZqiY8dEEQXsO5t4vMzARAcUMiBs4Zo6PNZCeOodnytyRsCHyykHeip1vlE1EukeW2O qfhpnaw0l58mvWllAniC7USMBjYINmazbSXfKam6P46nMjAjHxawgB4LVPcFgX/ZpA55Fz z7D3UChi6tFm9v2QLy2mj8YWCS/w407tU0JIrAYT/MutU3vV4aR/YWXaHI3RZ4CodZVRsW kKJWFsrVx4RJjXzgzoep9fGU4drN1l7/hvkXHo8waAYcF8lnqD/4swxcC6AILw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674960337; 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=2eXzspnSPDKxoH76FzSQYQ86/IV4gLJziOMaq/goYAA=; b=nqUNL3yoTw9FZm2fNh7kCa1WnrdzFJ8CBGiuEUSTXkzkXgTQIkimpi1Q/nPaxNe5EDB//6 maWldE8sJPeHx2e9TW2hTafM06oXfw8WVd8Ryh8kXs22F5LTdcf5nG7hOEEW8maLe/lNf7 uIjuV5blZ//E2AmPeyYRe65jvlS5BHzHfH+vGys4k5n1MiqwZDVvSUKPp9lsIc7N0JuAN+ qqMLFMtKql/7CToqOIuoQyXJ/SMZoDF/6OJhQVqImDnfVQn8rBdd35zfHObwCQHvQcfp8p /q8Arkb2VJvsQ6XqiMHAZhp+dDpD5pKIuDLrkQEi93XL2h+IdAG3B/9d3VWTHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674960337; a=rsa-sha256; cv=none; b=BSuB56iCjns+ZA+qQVDrnEgYdMylbwPbm8nnyCAcBw6h66p84u560dJU63tlAPq4yHHcHw X7/Scq0TxjtTxwp876u/HXf/nDf2nrkRRd09QTLnnFZaoVWR7OoRaQs8YhkA55FFLJ1a3P ZILC4hboszZUS0A2Au9bTzK5MIoAPs8LIQ2VCZpNX0546AttynJ15b1afrK5g/MWOhgwmr Qspv/B0r7Og5AI444p2rgOr8y8PSR3v3Bhy1FXzvxm0XwjqHCtsHCc6MzoM+ntbW3xWvWq i7VyPAazO5P2i7ySMY+5mOpVUlDO09Q/ipfx0RsQu7ogn0ijUjUKsgDPNIr9eg== 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 4P4Fzj4F5Pz1CKJ; Sun, 29 Jan 2023 02:45:37 +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 30T2jbL0007766; Sun, 29 Jan 2023 02:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T2jb4v007765; Sun, 29 Jan 2023 02:45:37 GMT (envelope-from git) Date: Sun, 29 Jan 2023 02:45:37 GMT Message-Id: <202301290245.30T2jb4v007765@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 1e28a78745 - main - git primer: Fix two errors List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org 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: 1e28a7874537a29cd4b10c6503079d6d7316d2e4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=1e28a7874537a29cd4b10c6503079d6d7316d2e4 commit 1e28a7874537a29cd4b10c6503079d6d7316d2e4 Author: Warner Losh AuthorDate: 2023-01-29 02:23:29 +0000 Commit: Warner Losh CommitDate: 2023-01-29 02:23:29 +0000 git primer: Fix two errors Recommend pushing HEAD:main in the vendor branch docs, since that's always going to be right. Stop recommending people set push.default to 'freebsd'. It's an enumerated value that's not a branch name. Most likely correct value here is 'upstream'. However, there's enough people with asymetrical setups that I'm just removing the setup rather than describe all the special cases. Sponsored by: Netflix --- documentation/content/en/articles/committers-guide/_index.adoc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 2974cf05cd..41ef2a507a 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -425,13 +425,6 @@ For pushing, either specify the full refspec: git push freebsd HEAD:refs/internal/admin .... -Or set `push.default` to `freebsd` which will make `git push` to push the current branch back to its upstream by default, which is more suitable for our workflow: - -[source,shell] -.... -git config push.default freebsd -.... - ==== Keeping Current With The FreeBSD src Tree [[keeping_current]] First step: cloning a tree. @@ -1496,7 +1489,7 @@ After review, when you are sure it is a good change, you can push it to the Free [source,shell] .... -% git push freebsd merge_results:main +% git push freebsd HEAD:main .... === Creating a new vendor branch