Date: Fri, 9 Apr 2021 20:17:59 GMT From: "George V. Neville-Neil" <gnn@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: a0fbda3eef - main - Rough draft on collaboration using github Message-ID: <202104092017.139KHxj6031691@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gnn (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=a0fbda3eef0f5d647a3eb3724704c13238068d7b commit a0fbda3eef0f5d647a3eb3724704c13238068d7b Author: George V. Neville-Neil <gnn@FreeBSD.org> AuthorDate: 2021-04-09 20:16:53 +0000 Commit: George V. Neville-Neil <gnn@FreeBSD.org> CommitDate: 2021-04-09 20:17:49 +0000 Rough draft on collaboration using github --- documentation/content/en/articles/committers-guide/_index.adoc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5effac883f..11af4b0088 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2021,7 +2021,8 @@ git log refs/freebsd/vendor/zlib/1.2.10 .... would look at the log for the vendor branch for zlib starting at 1.2.10. -=== Collaborating with Others + +=== Collaborating with others One of the keys to good software development on a project as large as FreeBSD is the ability to collaborate with others before you push your changes to the tree. The FreeBSD project's git repositories do not, yet, allow user created branches to be pushed to the repository, and therefore if you wish to share your changes with others you must use another mechanism, such as a hosted GitLab or GitHub, in order to share changes in a user generated branch. @@ -2041,6 +2042,7 @@ The first step is to create a fork of https://github.com/freebsd/freebsd-src[Fre The destination of the fork should be your own, personal, GitHub account (gvnn3 in my case). Now add a remote on your local system that points to your fork: +[source,shell] .... % git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v @@ -2051,6 +2053,7 @@ freebsd ssh://git@gitrepo.freebsd.org/src.git (push) .... With this in place you can create a <<keeping_a_local_branch,as shown above.>> +[source,shell] .... % git checkout -b gnn-github .... @@ -2058,6 +2061,7 @@ With this in place you can create a <<keeping_a_local_branch,as shown above.>> Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch. Before you can push you'll have to set the appropriate upstream, as git will tell you the first time you try to push to your +github+ remote: +[source,shell] .... % git push github fatal: The current branch gnn-github has no upstream branch. @@ -2068,6 +2072,7 @@ To push the current branch and set the remote as upstream, use Setting the push as +git+ advises allows it to succeed: +[source,shell] .... % git push --set-upstream github gnn-feature Enumerating objects: 20486, done. @@ -2088,6 +2093,7 @@ Branch 'gnn-feature' set up to track remote branch 'gnn-feature' from 'github'. Subsequent changes to the same branch will push correctly by default: +[source,shell] .... % git push Enumerating objects: 4, done.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104092017.139KHxj6031691>