From nobody Thu Feb 23 21:18:26 2023 X-Original-To: dev-commits-src-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 4PN5VB5scmz3smXZ; Thu, 23 Feb 2023 21:18:26 +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 4PN5VB5JM0z3JkM; Thu, 23 Feb 2023 21:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677187106; 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=soklxhyQiBc753JLS7VnfExOXtWG2AgAfxHBs94yDpY=; b=H/aUjPI57gi3+if9X2l/BtbR5tyIFMPLEoniGSZbm8pIJSAqEtLkSXZZ1CKy1XPTzGc0BN QDkWgNVYtpoNq6Dcl2t0YJDmdINpdLJi+XRA/uZMlRTbS+6daLvjPEzVp5qdJUNO+77IL+ tNV3tsTf+ZRJUxKhy0VUaTKqyvzyuHmc/gLhomy4z3t5V/fxgGc5pYwxgmJCM5+gVJS7UN f3cBj1Lu+tas5klKZlS4v0Tq9BZTVsKdtGurar4NIG+AbZDWHVOix3unx5DvIsPxhB2yy3 39ni1gBiJUoBk61YfY8pSkqGb1yekOqSXET2Uib8iKhjwtHo/DMzaAUDklFRsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677187106; 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=soklxhyQiBc753JLS7VnfExOXtWG2AgAfxHBs94yDpY=; b=ylS6497sb3wxDYkrN478Roth9UavCfUeXu5AqnReU6+acI488MW1f7fy9x2dZoyuS+O4HP E/qFYBTzaraQbdJVPSviRH0I8CmhbouMiDRot+1mPkfZbWWVWCtaEbL28deF+BvEl+1E9W 6T7GvFLRNESeRHHUDR1yu8e17zxm8heMoNH0AR280QqGFEnA99p+TX8Ov+HB+i8fo+Gmvz YvcJaofBplkL+d5l990mIiOvyhxmlPTyIW9zsFKMGnA/7DfQ5GqFZ3xstqjRO9G/fhwCYe 9hZ2jvHglutU/YoEVXslZCP9PCi1C5bHd1quWosLAHOyBk6z3OaGzuL2E8jiVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677187106; a=rsa-sha256; cv=none; b=eSbKgNooSAX3SWmTIps5qutH3f4im8o+mitpmR5ERup0DPTrd9o/5sGawUiKJ1qpINqy9m pp6/Sv2IojLYkiAu7vYhnCEH67ixiRw0azWgR4TgEt2nepDCVePnDQOeExLeilWZ5aNO3e cWp9GLMs1SRXalYVFbiOf/kCZradHhPhRcQYy/qhlf41vO3yhMQwOsI11kl3Ye514bad00 yEYlEwmffNgEGksi4GK0hBEt4xqS0glMTsff1GSCqUbt4l6y5uzlggKroiMXu+RfC4ft5G pLozhvZKfjChCisOhn5PmzmMj/KHYw8PPHMICJ9QF3elMbq/EXtpyW/TVGLDfQ== 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 4PN5VB4KR8zxqp; Thu, 23 Feb 2023 21:18:26 +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 31NLIQ2Z064380; Thu, 23 Feb 2023 21:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NLIQpI064379; Thu, 23 Feb 2023 21:18:26 GMT (envelope-from git) Date: Thu, 23 Feb 2023 21:18:26 GMT Message-Id: <202302232118.31NLIQpI064379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0455b90beedd - main - tools/git: fix typos in documentation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0455b90beeddb636b0644c5d47ef80ffb3e4b4c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0455b90beeddb636b0644c5d47ef80ffb3e4b4c7 commit 0455b90beeddb636b0644c5d47ef80ffb3e4b4c7 Author: Mina Galić AuthorDate: 2023-02-23 21:05:33 +0000 Commit: Ed Maste CommitDate: 2023-02-23 21:15:19 +0000 tools/git: fix typos in documentation and change mention of svn to git. Reviewed by: emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/659 --- tools/tools/git/HOWTO | 6 +++--- tools/tools/git/arcgit | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/tools/git/HOWTO b/tools/tools/git/HOWTO index 160696c4d236..9e0501c91896 100644 --- a/tools/tools/git/HOWTO +++ b/tools/tools/git/HOWTO @@ -28,7 +28,7 @@ commits. The intended workflow is: Differential, so try to give each commit a meaningful commit message that gives your reviewers the necessary context to understand your change. -2. Create your reviews bu running this command in your git repo: +2. Create your reviews by running this command in your git repo: $ arcgit -r C1~..C2 -R reviewer -T testplan C1 should be the first commit that you want reviewed, and C2 should be the @@ -36,7 +36,7 @@ commits. The intended workflow is: specifying the -R option multiple times. You can CC (AKA subscribe) people to a review with the -C option. Note that if you subscribe a mailing list to a review, the mailing list will be emailed for every comment or change - made to each review. Please be judicious when subscibing mailing lists to + made to each review. Please be judicious when subscribing mailing lists to reviews. It may be better to instead send a single email to the appropriate list announcing all of the reviews and giving a short summary of the change as a whole, along with a link to the individual reviews. @@ -75,7 +75,7 @@ commits. The intended workflow is: 4. Once the reviews have been approved, you need to prepare your patch series to be committed. This involves squashing the fixes made in code review back into the original commit that they applied to. This gives you a clean - series of commits that are ready to be commited back to svn. + series of commits that are ready to be pushed to git. First, merge each of your review branches back into your main development branch. For example: diff --git a/tools/tools/git/arcgit b/tools/tools/git/arcgit index 60d9abe58595..283856ae128f 100755 --- a/tools/tools/git/arcgit +++ b/tools/tools/git/arcgit @@ -35,8 +35,8 @@ # # When your reviews are complete, merge all of the review_DXXXX branches # together, and then do a git rebase -ik to meld the code review fixes into the -# commit that they fixed. Now you have a clean series of patches to commit to -# svn. +# commit that they fixed. Now you have a clean series of patches to push to +# git. usage() {