aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-07-30 15:04:28 +0200
committerGuido Günther <agx@sigxcpu.org>2011-07-30 15:04:28 +0200
commitd052ba250f68a34177bf31625ed7f0a0fb500936 (patch)
tree217fad38fc0105b2b6010a8ba933cae4e90c7c05 /docs
parent42a13a114f99fbedc52895eeb0b9089d41f4e160 (diff)
Document --time-machine option
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages/gbp-pq.sgml13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index 621dcca7..43e372fe 100644
--- 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>