diff options
| -rw-r--r-- | development/debian_packages_in_git.mdwn | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn index b737b0c..f0a0365 100644 --- a/development/debian_packages_in_git.mdwn +++ b/development/debian_packages_in_git.mdwn @@ -67,15 +67,13 @@ you do: gbp-pull This will update all necessary branches to what other developers might have -pushed in the meantime. If you're also using patch-queues as described above -you additionally have to refresh your *patch-queue* branch: +pushed in the meantime. If you're also using a patch-queue as described above +you can refresh that too in one step: - # Update to what others might have pushed - git-branch -D patch-queue/master - gbp-pq import - git checkout master + # Update to what others might have pushed and rebuild patch-queue + gbp-pull --redo-pq -Future versions of *gbp-pull* will allow you to do all the above steps at once. +This will additionally drop your current patch-queue branch and recreate it from debian/patches. # Preparing a Backport I keep backports on a separate *bpo-<release>* branch like *bpo-lenny*: |