summaryrefslogtreecommitdiff
path: root/development/debian_packages_in_git.mdwn
diff options
context:
space:
mode:
authoragx <agx@web>2009-08-08 14:34:14 +0200
committerWiki User <wikwik@wiki.sigxcpu.org>2009-08-08 14:34:14 +0200
commitfbb379d5d8d6681e6e1829883b3f224058802eab (patch)
tree71257b8383728c4586b3e1f505b20158d794aa89 /development/debian_packages_in_git.mdwn
parent80115148c3a926424b777140bd547f5906c908fd (diff)
put recommend way first
Diffstat (limited to 'development/debian_packages_in_git.mdwn')
-rw-r--r--development/debian_packages_in_git.mdwn9
1 files changed, 7 insertions, 2 deletions
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn
index 8c6680f..5111cb6 100644
--- a/development/debian_packages_in_git.mdwn
+++ b/development/debian_packages_in_git.mdwn
@@ -37,5 +37,10 @@ Assuming the Debian source package has it's patches in *debian/patches* and thes
git checkout master
gbp-pq export
-#### Team maintenance
-You can push out patch-queue branches. Other team members must just be aware that that branches in the *patch-queue/* namespace are being rebased frequently. But it's actually easier to simply use *gbp-pq import* and keep the patch-queue branch local only.
+### Team maintenance
+The easiest way is to not push out any patch-queue/* branches at all. They can be recreated by any team member easily by using
+
+ git branch -d patch-queue/master
+ gbp-pq import
+
+However you *can* push out patch-queue branches. Other team members must just be aware that that branches in the *patch-queue/* namespace are being rebased frequently.