Date: Mon, 21 Jun 2021 02:00:31 GMT From: Warner Losh <imp@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: e73b64ca49 - main - committers-guide: fix typos Message-ID: <202106210200.15L20VlQ064040@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=e73b64ca491b9df3a48491d7afd70ae93645d3d9 commit e73b64ca491b9df3a48491d7afd70ae93645d3d9 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-06-21 01:59:08 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-06-21 01:59:08 +0000 committers-guide: fix typos Noticed by: Pau Amma Sponsored by: Netflix --- documentation/content/en/articles/committers-guide/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 444aec401b..d97d4edc2f 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1730,7 +1730,7 @@ on freefall.freebsd.org to get a recipe that you can use directly, assuming /usr The below command merges the `working` branch into the upstream main line. It's important that you curate your changes to be just like you want them in the FreeBSD source repo before doing this. This syntax pushes the `working` branch to main, moving the `main` branch forward. -You will only be able to do this if this results in a linear change to `main1 (eg no merges). +You will only be able to do this if this results in a linear change to `main` (eg no merges). [source,shell] .... @@ -1766,7 +1766,7 @@ If you lose the race, then try again with % git pull --rebase % git push freebsd .... -These commands will fetch the most recent `freebse/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race. +These commands will fetch the most recent `freebsd/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race. Note: merging vendor branch commits will not work with this technique. ===== Finding the Subversion Revision
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106210200.15L20VlQ064040>