summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-08-15 12:21:26 +0200
committerGuido Guenther <agx@sigxcpu.org>2008-08-15 14:28:31 +0200
commit037626575b2a085c75cb1c3e2aa7d2977af6a61d (patch)
tree0452ab02d66cea5bd42a109933baad6d51581e6d
parentd1ea39df0e937416bcdbe34f86b98a87716541ca (diff)
document meta-closes
-rw-r--r--docs/manpages/git-dch.sgml10
-rw-r--r--gbp.conf5
2 files changed, 15 insertions, 0 deletions
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 3a395563..883b71e7 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -30,6 +30,7 @@
<arg><option>--auto</option></arg>
<arg><option>--full</option></arg>
<arg><option>--meta</option></arg>
+ <arg><option>--meta-closes=bug-close-tags</option></arg>
<arg><option>--snapshot-number=</option><replaceable>expression</replaceable></arg>
<arg><option>--git-log=</option><replaceable>git-log-options</replaceable></arg>
<arg choice="plain"><replaceable>[path1 path2]</replaceable></arg>
@@ -109,6 +110,15 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>--meta-closes=</option><replaceable>bug-close-tags</replaceable>
+ </term>
+ <listitem>
+ <para>What meta tags to look for to generate bug-closing changelog
+ entries. The default is 'Closes|LP' to support Debian an
+ Launchpad</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>--full</option></term>
<listitem>
<para>Include the full commit message in the changelog output</para>
diff --git a/gbp.conf b/gbp.conf
index 4c3805ee..5a0d6aa7 100644
--- a/gbp.conf
+++ b/gbp.conf
@@ -44,5 +44,10 @@
[git-dch]
#git-log = --no-merges
#snapshot-number = snapshot + 1
+# include 0 digits of the commit id in the changelog enty
#id-length = 0
+# don't include information from meta tags
#meta = False
+# what tags to look for to generate bug-closing changelog entries
+#meta-closes = Closes|LP
+