[website] 01/04: Add subsection Branches.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository website.

commit c751b74884881aac9b0d316e5756b308633098cc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 6 15:13:07 2015 +0200

    Add subsection Branches.
---
 policy.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/policy.xml b/policy.xml
index 82c7929..43c2781 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1610,7 +1610,26 @@ allowed_distributions = .*
       <sect3 id="git-package-branches">
         <title>Branches</title>
         <para>
-          ...
+          From time to time, there is a need to work in a branch for a stable
+          update or a security fix.
+          This kind of release specific packaging lives in its own release
+          specific branches in the
+          <link linkend="git-repository">git repository</link>.
+        </para>
+        <para>
+          First create a branch from the tag that represents the version
+          currently in the archive if there is no release specific branch yet:
+<programlisting>
+<command>git checkout</command> <option>-b</option> <replaceable>jessie</replaceable> <replaceable>debian/1.2.0-1</replaceable>
+</programlisting>
+          If the <replaceable>jessie</replaceable> branch already exists,
+          check it out and merge the version currently in the archive:
+<programlisting>
+<command>git checkout</command> <replaceable>jessie</replaceable>
+<command>git merge</command> <replaceable>debian/1.2.0-1</replaceable>
+</programlisting>
+          From this point on, work normally in the
+          <replaceable>jessie</replaceable> branch, build, tag and push.
         </para>
       </sect3>
       <sect3 id="git-patches">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git