From: Martin Pitt Date: Mon, 28 Apr 2014 10:55:14 +0000 (+0200) Subject: Document disabling of patch numbers X-Git-Tag: debian/247.3-7+deb11u1~2132^2~18 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=54c82fb5ae5d1c5c06d49c1eca40532ae6dd4941;p=systemd.git Document disabling of patch numbers Our debian/gbp.conf disables gbp-pq patch numbers, adjust README.source accordingly. --- diff --git a/debian/README.source b/debian/README.source index f9f10e3f0..2f179e549 100644 --- a/debian/README.source +++ b/debian/README.source @@ -22,7 +22,7 @@ which represents each quilt patch as git commit. You create this with Then you are in the patch-queue branch and can git log, commit, cherry-pick upstream commits, rebase, etc. there. After you are done, run - gbp-pq export --no-patch-numbers + gbp-pq export which will put you back into master and update debian/patches/ (including series). You need to git add etc. new patches, add a changelog and other @@ -58,7 +58,9 @@ do: Now resolve all the conflicts, skip obsolete patches, etc. When you are done, run - gbp-pq export --no-patch-numbers + gbp-pq export + +Note that our debian/gbp.conf disables patch numbers. Cherry-picking upstream patches -------------------------------