1 files changed, 29 insertions, 3 deletions
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index 2bb1645a..265e267c 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>
@@ -194,15 +196,16 @@
       <varlistentry>
         <term><option>--[no-]drop</option></term>
         <listitem>
-          <para>Whether to drop (delete) the patch queue branch after
+          <para>Whether to automatically drop (delete) the patch queue branch after
           a successful export</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--force</option></term>
         <listitem>
-          <para>In case of <option>import</option>, import even if the branch already
-            exists</para>
+          <para>In case of <option>import</option>, import even if the
+            patch-queue branch already exists and overwrite its
+            content with <filename>debian/patches</filename>.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -229,6 +232,29 @@
           </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>
+      <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>