r77934 - /website/git.pod

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Jul 27 20:46:27 2011
New Revision: 77934

URL: http://svn.debian.org/wsvn/?sc=1&rev=77934
Log:
first take on explaining how to branch. gregor, please review :)

Modified:
    website/git.pod

Modified: website/git.pod
URL: http://svn.debian.org/wsvn/website/git.pod?rev=77934&op=diff
==============================================================================
--- website/git.pod (original)
+++ website/git.pod Wed Jul 27 20:46:27 2011
@@ -213,9 +213,29 @@
 commits. See
 L<https://honk.sigxcpu.org/piki/development/debian_packages_in_git/>
 
-=head1 Branches (TODO)
-
-[How to handle branches for e.g. backports, t-p-u, security, ...]
+=head1 Branches
+
+From time to time, there is a need to work in a branch for a stable update or a
+security fix. Things are simple:
+
+First create a branch from the tag that represents the version currently in the
+archive:
+
+    $ git branch squeeze debian/2.40-5
+    $ git checkout squeeze
+
+or, with one command
+
+    $ git checkout -b squeeze debian/2.40-5
+
+If the squeeze branch already exists, check it out and merge the version
+currently in the archive:
+
+    $ git checkout squeeze
+    $ git merge debian/2.40-5
+
+From this point on, work normally in the C<squeeze> branch, build, tag and
+push.
 
 =head1 Mass changes