diff options
| author | Maximiliano Curia <maxy@debian.org> | 2016-08-18 13:11:20 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2016-09-07 19:17:58 +0200 |
| commit | e615c658375c4332793ea189c3737f20e7bba3f6 (patch) | |
| tree | 0463a902a0050c12ea51473707d591ebed117920 | |
| parent | 844ae3cf6086fa66fee0ef8ee25478629f31b4b2 (diff) | |
pq: Handle unmerged debian branches (documentation)
Closes: #834726
| -rw-r--r-- | docs/manpages/gbp-pq.sgml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml index 76f6dfba..4c1c79eb 100644 --- a/docs/manpages/gbp-pq.sgml +++ b/docs/manpages/gbp-pq.sgml @@ -29,6 +29,8 @@ <arg><option>--force</option></arg> <arg><option>--meta-closes=bug-close-tags</option></arg> <arg><option>--meta-closes-bugnum=bug-number-format</option></arg> + <arg><option>--pq-from=</option><replaceable>[DEBIAN|TAG]</replaceable></arg> + <arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg> <group choice="plain"> <arg><option>drop</option></arg> <arg><option>export</option></arg> @@ -230,6 +232,30 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><option>--pq-from=</option><replaceable>[DEBIAN|TAG]</replaceable> + </term> + <listitem> + <para> + How to find the starting point for the patch queue base. The options are DEBIAN, that will use the Debian branch as the base for the patch queue branch, and TAG, that will use the corresponding upstream tag as a base for the patch queue branch. + </para> + <para> + This is only needed if your upstream branch is not merged in the Debian branch. + The default is <replaceable>DEBIAN</replaceable>. + </para> + </listitem> + </varlistentry> + </variablelist> + <varlistentry> + <term><option>--upstream-tag=</option><replaceable>TAG-FORMAT</replaceable> + </term> + <listitem> + <para> + Use this tag format when looking for tags of upstream versions, + default is <replaceable>upstream/%(version)s</replaceable>. + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> <refsect1> |