merger to 655a6f0528afcebe1b4493abe865ee568c505bbf

diff --cc docs/manpages/gbp-buildpackage.sgml
index d0b5a13,f382634..382b781
--- 1/docs/manpages/gbp-buildpackage.sgml
--- 2/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@@ -261,30 -206,26 +261,45 @@@
          </listitem>
        </varlistentry>
        <varlistentry>
 +        <term><option>--git-color-scheme</option>=<replaceable>COLOR_SCHEME</replaceable>
 +        </term>
 +        <listitem>
 +          <para>
 +          Colors to use in output (when color is enabled). The format for
 +          COLOR_SCHEME is
 +          '&lt;debug&gt;:&lt;info&gt;:&lt;warning&gt;:&lt;error&gt;'.
 +          Numerical values and color names are accepted, empty fields imply
 +          the default color. For example --git-color-scheme='cyan:34::' would
 +          show debug messages in cyan, info messages in blue and other messages
 +          in default (i.e. warning and error messages in red).
 +          </para>
 +        </listitem>
 +      </varlistentry>
 +      <varlistentry>
 +        <term><option>--git-upstream-branch</option>=<replaceable>BRANCH_NAME</replaceable>
+         <term><option>--git-color-scheme</option>=<replaceable>COLOR_SCHEME</replaceable></term>
+         <listitem>
+           <para>
+           Colors to use in output (when color is enabled). The format for
+           COLOR_SCHEME is
+           '&lt;debug&gt;:&lt;info&gt;:&lt;warning&gt;:&lt;error&gt;'.
+           Numerical values and color names are accepted, empty fields imply
+           the default color. For example --git-color-scheme='cyan:34::' would
+           show debug messages in cyan, info messages in blue and other messages
+           in default (i.e. warning and error messages in red).
+           </para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term><option>--git-upstream-branch</option>=<replaceable>branch_name</replaceable>
          </term>
          <listitem>
 -        <para>Branch to build the orig tarball from if <option>--git-upstream-tree</option>
 -        is set to <replaceable>BRANCH</replaceable>. Default is
 -        <replaceable>upstream</replaceable>.</para>
 +          <para>
 +          Branch to build the orig tarball from if
 +          <option>--git-upstream-tree</option> is set to
 +          <replaceable>BRANCH</replaceable>. Default is
 +          <replaceable>upstream</replaceable>.
 +          </para>
          </listitem>
        </varlistentry>
        <varlistentry>
@@@ -329,12 -265,22 +344,21 @@@
          </listitem>
        </varlistentry>
        <varlistentry>
 -        <para>use this keyid for gpg signing tags</para>
+         <term><option>--git-keyid=</option><replaceable>gpg-keyid</replaceable>
+         </term>
+         <listitem>
 -        <term><option>--git-posttag=</option><replaceable>command</replaceable>
++          <para>
++          Include git submodules in the orig tarball.
++          </para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
 +        <term><option>--git-keyid=</option><replaceable>GPG-KEYID</replaceable>
          </term>
          <listitem>
 -        <para>excecute <replaceable>command</replaceable> after tagging a new
 -        version.</para><para>Exported environment variables are:
 -        <envar>GBP_TAG</envar> (the name of the generated tag),
 -        <envar>GBP_BRANCH</envar> (the branch the package was build from) and
 -        <envar>GBP_SHA1</envar> (the sha1 of the commit the tag was created
 -        at).</para>
 +          <para>
 +          use this keyid for gpg signing tags
 +          </para>
          </listitem>
        </varlistentry>
        <varlistentry>

diff --cc docs/manpages/gbp-dch.sgml
index 8ffdc4f,94a535a..0959ca2
--- 1/docs/manpages/gbp-dch.sgml
--- 2/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.sgml
@@@ -356,22 -310,20 +356,33 @@@
          <term><option>--commit</option>
          </term>
          <listitem>
 -        <para>Commit the generated changelog.</para>
 +          <para>
 +          Commit the generated changelog.
 +          </para>
 +        </listitem>
 +      </varlistentry>
 +      <varlistentry>
 +        <term><option>--customizations=</option><replaceable>customization-file</replaceable>
 +        </term>
 +        <listitem>
 +          <para>
 +          Load Python code from <replaceable>customization-file</replaceable>.
 +          At the moment, the only useful thing the code can do is define a
 +          custom format_changelog_entry() function.
 +          </para>
          </listitem>
        </varlistentry>
+       <varlistentry>
+         <term><option>--customizations=</option><replaceable>customization-file</replaceable>
+         </term>
+         <listitem>
+           <para>
+           Load Python code from <replaceable>customization-file</replaceable>.
+           At the moment, the only useful thing the code can do is define a
+           custom format_changelog_entry() function.
+           </para>
+         </listitem>
+       </varlistentry>
      </variablelist>
    </refsect1>
    <refsect1>

diff --cc docs/manpages/gbp-import-orig.sgml
index 714a534,74a0f63..f5326d3
--- 1/docs/manpages/gbp-import-orig.sgml
--- 2/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@@ -218,18 -191,16 +218,27 @@@
        <varlistentry>
          <term><option>--uscan</option></term>
          <listitem>
 -          <para>Use uscan to fetch new upstream version.</para>
 +          <para>
 +          Use uscan to fetch new upstream version.
 +          </para>
 +        </listitem>
 +      </varlistentry>
 +      <varlistentry>
 +        <term><option>--[no-]interactive</option></term>
 +        <listitem>
 +          <para>
 +          Run command interactively, i.e. ask package name and version if
 +          needed.
 +          </para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term><option>--[no-]interactive</option></term>
+         <listitem>
+           <para>
+           Run command interactively, i.e. ask package name and version if
+           needed.
+           </para>
          </listitem>
        </varlistentry>
      </variablelist>

diff --cc docs/manpages/gbp-pq.sgml
index e094208,697916c..ba195e9
--- 1/docs/manpages/gbp-pq.sgml
--- 2/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@@ -123,9 -124,35 +125,23 @@@
    <refsect1>
      <title>OPTIONS</title>
      <variablelist>
 -      <varlistentry>
 -        <term><option>--verbose</option></term>
 -      <term><option>-v</option></term>
 -        <listitem>
 -          <para>verbose execution</para>
 -        </listitem>
 -      </varlistentry>
 -      <varlistentry>
 -        <term><option>--color=</option><replaceable>[auto|on|off]</replaceable>
 -        </term>
 -        <listitem>
 -          <para>Whether to use colored output.</para>
 -        </listitem>
 -      </varlistentry>
 +      &man.common.options.description;
 +
        <varlistentry>
+         <term><option>--color-scheme</option>=<replaceable>COLOR_SCHEME</replaceable></term>
+         <listitem>
+           <para>
+           Colors to use in output (when color is enabled). The format for
+           COLOR_SCHEME is
+           '&lt;debug&gt;:&lt;info&gt;:&lt;warning&gt;:&lt;error&gt;'.
+           Numerical values and color names are accepted, empty fields imply
+           the default color. For example --git-color-scheme='cyan:34::' would
+           show debug messages in cyan, info messages in blue and other messages
+           in default (i.e. warning and error messages in red).
+           </para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
          <term><option>--[no-]patch-numbers</option>
          </term>
          <listitem>