Merge to 36c8e5cd00fd600be63160b0ef9427a70ab45870

diff --cc docs/manpages/gbp-buildpackage.sgml
index 382b781,d0d68bc..150d5b6
--- 1/docs/manpages/gbp-buildpackage.sgml
--- 2/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@@ -277,21 -276,6 +277,21 @@@
        </varlistentry>
        <varlistentry>
          <term><option>--git-upstream-branch</option>=<replaceable>BRANCH_NAME</replaceable>
-         <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>
@@@ -353,15 -337,6 +353,27 @@@
          </listitem>
        </varlistentry>
        <varlistentry>
 +        <term><option>--git-keyid=</option><replaceable>GPG-KEYID</replaceable>
 +        </term>
 +        <listitem>
 +          <para>
 +          use this keyid for gpg signing tags
++        <term><option>--git-posttag=</option><replaceable>COMMAND</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>
 +        </listitem>
 +      </varlistentry>
 +      <varlistentry>
          <term><option>--git-posttag=</option><replaceable>COMMAND</replaceable>
          </term>
          <listitem>
@@@ -397,6 -372,6 +409,10 @@@
          </term>
          <listitem>
            <para>
++        <term><option>--git-postexport=</option><replaceable>COMMAND</replaceable>
++        </term>
++        <listitem>
++          <para>
            execute <replaceable>COMMAND</replaceable> after exporting the source
            tree - valid only if --git-export-dir has been specified.
            </para>

diff --cc docs/manpages/gbp-pq.sgml
index ba195e9,e094208..39bf0db
--- 1/docs/manpages/gbp-pq.sgml
--- 2/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@@ -128,20 -126,6 +126,7 @@@
        &man.common.options.description;
  
        <varlistentry>
-         <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>--color-scheme</option>=<replaceable>COLOR_SCHEME</replaceable></term>
          <term><option>--[no-]patch-numbers</option>
          </term>
          <listitem>