Date: Mon, 14 Jun 2021 17:37:40 GMT From: Warner Losh <imp@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 09d6adaf27 - main - committer-guide: Add link to migration article Message-ID: <202106141737.15EHbeqe037700@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=09d6adaf27ed0a4333a4bcc1267851c6a9125e34 commit 09d6adaf27ed0a4333a4bcc1267851c6a9125e34 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-06-14 17:35:53 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-06-14 17:37:09 +0000 committer-guide: Add link to migration article Although the final commit in the old, legacy repo had excellent details on migration, this article has a few details that might also be helpful in migrating. Add it as an additional resource. Sponsored by: Netflix --- documentation/content/en/articles/committers-guide/_index.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 8cc8a8beeb..638c2a8100 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1769,6 +1769,7 @@ The hex number after 'commit' is the hash you can use to refer to this commit. Note: as of this writing, https://github.com/freebsd/freebsd-src is mirroring all official branches, along with a `master` branch which is the legacy svn2git result. The `master` branch will not be updated anymore, and the link:https://github.com/freebsd/freebsd-src/commit/de1aa3dab23c06fec962a14da3e7b4755c5880cf[last commit] contains the instructions for migrating to the new `main` branch. We'll retain the `master` branch for a certain time, but in the future it will only be kept in the link:https://github.com/freebsd/freebsd-legacy[freebsd-legacy] repository. +In addition, link:https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree[this article] has an earlier version of the last commit instructions that may be helpful. When migrating branches from a GitHub fork from the old GitHub mirror to the official repo, the process is straight forward. This assumes that you have a `freebsd` upstream pointing to GitHub, adjust if necessary.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106141737.15EHbeqe037700>