[SCM] live-manual branch, debian-next, updated. debian/3.0_a17-1-5-g706922d

chals chals at altorricon.com
Fri Sep 28 15:19:30 UTC 2012


The following commit has been merged in the debian-next branch:
commit 706922d7f6f344ade755d30f61dda4c2260ab61b
Author: chals <chals at altorricon.com>
Date:   Fri Sep 28 17:18:52 2012 +0200

    Adding a section about the project's git repositories, project_git.ssi, and adding myself to the list of authors.

diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index faa3b80..5d8b2ce 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -56,6 +56,8 @@ _* Ben Armstrong
 
 _* Brendan Sleight
 
+_* Carlos Zuferri
+
 _* Chris Lamb
 
 _* Daniel Baumann
@@ -82,7 +84,7 @@ This manual is intended as a community project and all proposals for improvement
 
 When submitting a contribution, please clearly identify its copyright holder and include the licensing statement. Note that to be accepted, the contribution must be licensed under the same license as the rest of the document, namely, GPL version 3 or later.
 
-The sources for this manual are maintained using the Git version control system. You can check out the latest copy by executing:
+The sources for this manual are maintained using the Git version control system (see {Git repositories}#git-repositories). You can check out the latest copy by executing:
 
 code{
 
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 808b406..99ed508 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -57,6 +57,8 @@
 
 << project_procedures.ssi
 
+<< project_git.ssi
+
 :B~ Examples
 
 << user_examples.ssi
diff --git a/manual/en/project_git.ssi b/manual/en/project_git.ssi
new file mode 100644
index 0000000..ee800e3
--- /dev/null
+++ b/manual/en/project_git.ssi
@@ -0,0 +1,43 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different branches. There is a list of all the available repositories at http://live.debian.net/gitweb The *{debian}* and the *{debian-next}* branches are particularly noteworthy because they contain the actual work that will eventually be included in each new release.
+
+The project's git URLs have the form: #{protocol://live.debian.net/git/repository}#. 
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form: #{git at live.debian.net:/repository}#. 
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories. You will be on the *{debian}* branch. This is appropriate to take a look at the state of the project's latest release but before starting work it is crucial to switch to the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all the changes are committed first before being merged into the *{debian}* branch. To make an analogy, it is like a testing ground. If you are working on this branch and need to pull, you will have to do a #{git pull --rebase}# so that your local modifications are staged while pulling from the server and then your changes will be put on top of it all.

-- 
live-manual



More information about the debian-live-changes mailing list