diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-03-11 18:08:58 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-03-12 23:12:22 +0100 |
| commit | 40f4709668425b03b9f59c28176547c313957715 (patch) | |
| tree | 166980187712abd948005dce6b348899956a0a8b /docs | |
| parent | 9bb73b46d2f215dc70482e55311a64debeca4d6e (diff) | |
gbp-pq: Allow to specify subdirs for patches
via the "Gbp-Pq-Tag: <subdir>" directive in the patch header. This also
gets rid sed callouts.
Add "apply" action to apply single patches
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/gbp-pq.sgml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml index cf55dd05..83b05006 100644 --- a/docs/manpages/gbp-pq.sgml +++ b/docs/manpages/gbp-pq.sgml @@ -23,11 +23,13 @@ <arg><option>--verbose</option></arg> <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> <group choice="plain"> <arg><option>export</option></arg> <arg><option>import</option></arg> <arg><option>rebase</option></arg> <arg><option>drop</option></arg> + <arg><option>apply</option></arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -91,6 +93,18 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><option>apply</option> + </term> + <listitem> + <para> + Add a single patch to the patch-queue similar to using + <command>git-am</command>. Use <option>--topic</option> if you want + the patch to appear in a separate subdir when exporting the patch queue + using <option>export</option>. This can be used to separate upstream + pathes from debian specific patches.</para> + </listitem> + </varlistentry> </variablelist> </refsect1> <refsect1> @@ -117,6 +131,13 @@ <para>Whether the patch files should start with a number or not.</para> </listitem> </varlistentry> + <varlistentry> + <term><option>--topic=</option><replaceable>topic</replaceable> + </term> + <listitem> + <para>Topic to use when importing a single patch</para> + </listitem> + </varlistentry> </variablelist> </refsect1> <refsect1> |