diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-06 16:29:39 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-06 16:37:31 -0300 |
| commit | 698e7bf6cb34cd89f2a6ad231abdbe0977db64f9 (patch) | |
| tree | 6aba6cd4fff8b0ddad668b6d2f9ae9d5aa1752db /docs | |
| parent | f145e1d3b2057a12f99ec846b60b0f95659e2035 (diff) | |
docs: add some more explanations
after feedback from Chris Lamb.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/chapters/patches.sgml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/chapters/patches.sgml b/docs/chapters/patches.sgml index 50123e3a..c3f5f509 100644 --- a/docs/chapters/patches.sgml +++ b/docs/chapters/patches.sgml @@ -2,7 +2,7 @@ <title>Working with patches</title> <para> - &gbp-pq; can be used to manage patches that modify the ustream + &gbp-pq; can be used to manage patches that modify the upstream source inside <filename>debian/patches/</filename>. This is mostly intended for 3.0 (quilt) format source packages. @@ -19,7 +19,7 @@ a </para> <programlisting> - &gbp; pq imort + &gbp-pq-import; </programlisting> <para> then the newly created branch will be @@ -168,7 +168,8 @@ <listitem> <para> Imports the current patches onto the patch-queue branch (if - not done already) using &gbp-pq-import;. + not done already) using &gbp-pq-import;. This will allow you + to rebase the patches on the new upstream version later. </para> </listitem> <listitem> @@ -180,7 +181,10 @@ <listitem> <para> Rebases the patches onto the new upstream version using - &gbp-pq-rebase;. + &gbp-pq-rebase;. This will bring the patches up to date + regarding the new upstream version. Patches already applied + upstream can be dropped and remaining patches can be modified + to apply to the new version. </para> </listitem> <listitem> |