Differences

This shows you the differences between two versions of the page.

--- git [2021/04/25 07:37] – Fix DevSummit links. JethroNederhof
+++ git [2023/05/29 12:08] (current) – Tidiness. GrahamPerrin
@@ Line 1: / Line 1: @@
-===== Using Git for FreeBSD Development Today =====
+====== Using Git for FreeBSD Development ======
-**The latest document about using git for tracking or developing %%FreeBSD%% is at [[https://github.com/bsdimp/freebsd-git-docs]]**
+Please see the [[https://docs.freebsd.org/en/articles/committers-guide/#git-primer|Git Primer]] in the Committer's Guide and [[https://docs.freebsd.org/en/books/handbook/mirrors/#git|Using Git]] in the %%FreeBSD%% Handbook.
-It will be sorted out as a chapter in handbook and committer's guide.
-The way of using git to hack on %%FreeBSD%% in svn is documented here: GitWorkflow. (Mostly obsoleted by migrating to git.)
+Email: [[https://lists.freebsd.org/subscription/freebsd-git|freebsd-git]]
-A good [[UlrichSpoerlein/GitTalkDevSummit|introduction to Git]] was presented by UlrichSpoerlein at the [[DevSummit/201005|Devsummit 2010 in Ottawa]].
+IRC: ''%%#gitcvt%%'' on EFnet
-===== Official Mirrors =====
+===== Mirrors =====
-https://git.FreeBSD.org is the official mirror for the public, currently has doc and src trees.
+Primary:
-The [[https://github.com/freebsd/|FreeBSD project page on Github]] has the official mirrors for src, doc, and ports repositories.
+  * ''%%git.freebsd.org%%''
+  * uses %%GeoDNS%%
+  * HTTPS, SSH and anonymous SSH URLs are listed at https://cgit.freebsd.org/doc/, https://cgit.freebsd.org/ports/ and https://cgit.freebsd.org/src/.
-===== Git for FreeBSD Development in the Future =====
+External mirrors are listed in [[https://docs.freebsd.org/en/books/handbook/mirrors/#external-mirrors|an appendix to the FreeBSD Handbook]].
-In 2019, Core chartered a [[https://lists.freebsd.org/mailman/listinfo/freebsd-git|Git Working Group]] ([[https://www.youtube.com/watch?v=9nc8N6GtAPg#t=46m00s|May 2019 DevSummit announcement (Youtube)]]; {{devsummit/201905/core.10_bsdcan_status_update.pdf?linkonly|Slides from same, p. 49+}}) to work out the implementation details of using Git as the primary VCS for %%FreeBSD%% development.
+===== Tips =====
+GitTips
+===== News =====
+…
 ===== Tutorials =====
-  * [[https://bsdimp.blogspot.com/2020/09/freebsd-subversion-to-git-migration.html|Subversion to Git Migration: Part 1]] by WarnerLosh
-  * [[https://bsdimp.blogspot.com/2020/10/freebsd-git-primer-for-users.html|Subversion to Git Migration: Part 2]] by WarnerLosh
+…
 ===== References =====
-  * [[git_2|Git Transition Process]]
+…
+===== Historical Content =====
+[[UlrichSpoerlein/GitTalkDevSummit|Introduction to Git]] ([[UlrichSpoerlein|Ulrich Spoerlein]], [[DevSummit/201005|Devsummit 2010]], Ottawa)
+GitWorkflow: using Git to hack on %%FreeBSD%% in svn. Begun in 2011, mostly obsoleted by migrating to Git.
+In 2019, Core chartered a Git Working Group ([[https://www.youtube.com/watch?v=9nc8N6GtAPg#t=46m00s|May 2019 DevSummit announcement (Youtube)]]; {{devsummit/201905/core.10_bsdcan_status_update.pdf?linkonly|Slides from same, p. 49+}}) for a detailed implementation of using Git as the primary system for %%FreeBSD%% development.
+Subversion to Git Migration: [[https://bsdimp.blogspot.com/2020/09/freebsd-subversion-to-git-migration.html|Parts 1]] and [[https://bsdimp.blogspot.com/2020/10/freebsd-git-primer-for-users.html|2]] ([[WarnerLosh|Warner Losh]], 2020).
+[[GitTransition|Git Transition Process]]
+**2021-06-08:** The vendor/openzfs branch was renamed ([[https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html|details]]).
+**2022-02-09:** The vendor/illumos branch was updated and rolled back to its previous state due to some missing commit metadata ([[https://lists.freebsd.org/archives/dev-commits-src-all/2022-February/006642.html|details]]).