Date: Fri, 19 Mar 2021 20:20:39 GMT From: Warner Losh <imp@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 05792e1b62 - main - Minor word smithing Message-ID: <202103192020.12JKKde2090185@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=05792e1b62221dc9cb7e6985f71e074f84d3b4c5 commit 05792e1b62221dc9cb7e6985f71e074f84d3b4c5 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-03-19 20:19:28 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-03-19 20:19:28 +0000 Minor word smithing Fix a few typoes, grammar errors, wrong word choices, and a bad url. Submitted by: Pau Amma --- .../content/en/articles/committers-guide/_index.adoc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 8237c47680..3f39b45571 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1738,7 +1738,8 @@ If not, you'll need to resolve the conflicts as you go. The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree. You can then `git rebase -i` both these branches, selecting the changes you want in `fred` or `wilma` by retaining the pick likes, and deleting the rest from the editor. -Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split, you can undo it with the following sequence: +Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split. +You can undo it with the following sequence: [source,shell] .... @@ -1781,10 +1782,10 @@ Here we see the changes I've made. You can use it to figure out where things went wrong. I'll just point out a few things here. The first one is that HEAD@{X} is a 'commitish' thing, so you can use that as an argument to a command. -Though if that command commits anything to the repository, the X numbers change. -You can also use the hash (first column) as well. +Although if that command commits anything to the repository, the X numbers change. +You can also use the hash (first column). -Next 'Encourage contributions' was the last commit I did to `wilma` before I decided to split things up. +Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up. You can also see the same hash is there when I created the `fred` branch to do that. I started by rebasing `fred` and you see the 'start', each step, and the 'finish' for that process. While we don't need it here, you can figure out exactly what happened. @@ -1981,7 +1982,7 @@ There's a number of ways around this with 'git worktree': [source,shell] .... -% git clone --mirror https://cgit.freebsd.org/ports.git ports.git +% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd ports.git % git worktree add ../ports main % git worktree add ../quarterly branches/2020Q4 @@ -2014,7 +2015,7 @@ To setup your repository to do that: git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*' .... -which will put everything in the upstream repository into your local repository's 'ref/freebsd/' namespace. +which will put everything in the upstream repository into your local repository's 'refs/freebsd/' namespace. Please note, that this also grabs all the unconverted vendor branches and the number of refs associated with them is quite large. You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103192020.12JKKde2090185>