d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/git: fix typos in documentation

Browse Source 
and change mention of svn to git.

Reviewed by:	emaste
Pull Request:	https://github.com/freebsd/freebsd-src/pull/659
This commit is contained in:
Mina Galić 2023-02-23 21:05:33 +00:00 committed by Ed Maste
parent c9ba91435a
commit 0455b90bee
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/tools/git/HOWTO
View File

@ -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:

4
tools/tools/git/arcgit
View File

@ -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()
{