Document --time-machine option

diff --git a/debian/rules b/debian/rules
index a7cf68f..93d3ebc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,8 @@ links_stamp:
        touch links_stamp
        
 apidocs: links_stamp
-       epydoc -o docs/apidocs/ gbp*.py git*.py gbp/
+       epydoc -n git-buildpackage --no-sourcecode -o docs/apidocs/ \
+               gbp*.py git*.py gbp/
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 pychecker:

diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index 621dcca..43e372f 100644 (file)
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -24,6 +24,7 @@
       <arg><option>--color=</option><replaceable>[auto|on|off]</replaceable></arg>
       <arg><option>--[no-]patch-numbers</option></arg>
       <arg><option>--topic=</option><replaceable>topic</replaceable></arg>
+      <arg><option>--time-machine=</option><replaceable>num</replaceable></arg>
       <group choice="plain">
       <arg><option>export</option></arg>
       <arg><option>import</option></arg>
@@ -138,6 +139,18 @@
           <para>Topic to use when importing a single patch</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--time-machine=</option><replaceable>NUM</replaceable>
+        </term>
+        <listitem>
+         <para>When importing a patch queue fails, go back commit by
+         commit on the current branch to check if the patch-queue applies
+         there. Do this at most <replaceable>NUM</replaceable> times. This can
+         be useful if the patch-queue doesn't apply to the current branch HEAD
+         anymore, e.g.  after importing a new upstream version.
+         </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   <refsect1>