From nobody Sat Jan 28 21:38:23 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 4P479C46cBz3cFYg for ; Sat, 28 Jan 2023 21:38:23 +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 4P479C3GJ8z3K7V; Sat, 28 Jan 2023 21:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674941903; 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=hD3ZfcFj9PAF2uT/IhdZPNJ+IkB+qk+kJF9qIU5HQZM=; b=knRNxGTnH0aSaveIjcz2oRnlVkEjSMx/8/44QMoCTAQ9dnGEXJc6gApu20i5tC1GRLk3nP 24n2Jqa5+GUhip+difhqVQVkaxFERQQ7s94A5HCC0LN5Idcxy9qcvhqKJPLh+gSPKjTfzP sI+H0O6CsUwAXujEVpvsPRwYBkF6S13HNG6efYXk3mpDlzamtnOhLmpehyCMFF7NxtnYWl mfF6Fu79XJln6CsfxBiAwQzaDu8+85iEFlUEm0FRwlG44x+1CK4ABAIOTlaC9eKLniMT+Y twwsL5NyUQhthdLIh5I2sAh3mVZnUQyQY+j0UWYGOJyboES0wZQQ9Vb4mri/bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674941903; 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=hD3ZfcFj9PAF2uT/IhdZPNJ+IkB+qk+kJF9qIU5HQZM=; b=lM9BSUyTvcZ2sexVnNyk9Jl67u3i6uEuX6M0qUXv8wIUPHniNaM+iJ5a/XPMYv/TeXgzP5 iP1Ztd5LGZ8m3FwWNAAN1SFvxXv+zcuLx0x2uVcBnCaGz9x1yBBS4uAp3KDw20sQVN87A5 bj4vEmqXI6VWwSVDwtJLAo3XS/bkhIkQGb2HJ3LaR9Qu/hizVEJmS8z+u/HLHoxAOwPfUL ooa1xO8XYJKsqGqI7scMbquuZtmOoStBHXDI5GlkVVJ9ZC54UJDx6dMcXZwhhZwPC337Y3 HPfV7L+bjVXvDYu4qJJeauIFqJiA3dM7iRLHgHG5W1BEsr8i3FZ4REYyFjrGgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674941903; a=rsa-sha256; cv=none; b=nEATjYdKBWuhvJZX44DArEWhO07A54Loc7SQLNa7vEVtwYqTCW1SCgWOUpyAAQzTzlWyBd WLeMNxKeUCufhJ/Q7Qlr2WyRezQmEZ5mlQBs+BGkWP7RcOz1eqQCiH176wnark6a2NWVVg i8m7jv+0dvL3nMkq7F45eJqiZCwbp9uq6yBn9enu3v7jy7gsJgxj1lixtoRWHQEF6OBN1A A7sazBk8X7+iSjpBBewZzEmYzWfm49duo5AwqRQNKyi54bqXYCxofIJ98+25jWh76OH721 uykwHVZg0i/PLA4tcAJjq89NuuFhGXLDIaBwyvXNt1kzOYQI7jx5sHtfk99TRw== 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 4P479C22Gqz14J5; Sat, 28 Jan 2023 21:38:23 +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 30SLcNAs066341; Sat, 28 Jan 2023 21:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30SLcN0K066340; Sat, 28 Jan 2023 21:38:23 GMT (envelope-from git) Date: Sat, 28 Jan 2023 21:38:23 GMT Message-Id: <202301282138.30SLcN0K066340@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 60326f6731 - main - git primer: Fix push command 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: 60326f67313a2b69d73d6394c8fbcdaea57b5310 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=60326f67313a2b69d73d6394c8fbcdaea57b5310 commit 60326f67313a2b69d73d6394c8fbcdaea57b5310 Author: Warner Losh AuthorDate: 2023-01-28 21:25:29 +0000 Commit: Warner Losh CommitDate: 2023-01-28 21:25:29 +0000 git primer: Fix push command The instructions leave one on the merge_results branch, not on main, so pushing the remote repo won't work. You have to specifically add the branch name on the push for that to work. Noticed by: sjg 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 dd67ca83f7..2974cf05cd 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1496,7 +1496,7 @@ After review, when you are sure it is a good change, you can push it to the Free [source,shell] .... -% git push freebsd main +% git push freebsd merge_results:main .... === Creating a new vendor branch