Date: Thu, 23 Feb 2023 21:18:26 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0455b90beedd - main - tools/git: fix typos in documentation Message-ID: <202302232118.31NLIQpI064379@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0455b90beeddb636b0644c5d47ef80ffb3e4b4c7 commit 0455b90beeddb636b0644c5d47ef80ffb3e4b4c7 Author: Mina Galić <freebsd@igalic.co> AuthorDate: 2023-02-23 21:05:33 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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() {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302232118.31NLIQpI064379>