summaryrefslogtreecommitdiff
path: root/docs/manpages
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2015-01-22 21:37:43 +0100
committerGuido Günther <agx@sigxcpu.org>2015-01-22 22:40:09 +0100
commit644c97f37ce91d464988eddc5f60624a06ff8e73 (patch)
treed30dce7b94057fdb1fd9c1f366d27d9595622c31 /docs/manpages
parent428e8957efc79f4db8dd62b131242dde89d5a72a (diff)
dch: Support Gbp-Dch: besides Git-Dch:
Diffstat (limited to 'docs/manpages')
-rw-r--r--docs/manpages/gbp-dch.sgml36
1 files changed, 21 insertions, 15 deletions
diff --git a/docs/manpages/gbp-dch.sgml b/docs/manpages/gbp-dch.sgml
index 22ab568..5303c62 100644
--- a/docs/manpages/gbp-dch.sgml
+++ b/docs/manpages/gbp-dch.sgml
@@ -13,8 +13,8 @@
&dhsection;
</refmeta>
<refnamediv>
- <refname>git-dch;</refname>
- <refname>gbp-dch;</refname>
+ <refname>git-dch</refname>
+ <refname>gbp-dch</refname>
<refpurpose>Generate the &debian; changelog from git commit messages</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -147,7 +147,7 @@
<listitem>
<para>
Parse meta tags like <option>Closes:</option>,
- <option>Thanks:</option> and <option>Git-Dch:</option>. See META TAGS
+ <option>Thanks:</option> and <option>Gbp-Dch:</option>. See META TAGS
below.
</para>
</listitem>
@@ -408,19 +408,25 @@
</para>
<variablelist>
<varlistentry>
- <term><option>Git-Dch</option>: <replaceable>action</replaceable>
- </term>
+ <term>
+ <option>Gbp-Dch</option>: <replaceable>action</replaceable>
+ </term>
<listitem>
<para>
- Supported actions are: <replaceable>Ignore</replaceable> which will
- ignore this commit when generating
- <filename>debian/changelog</filename>,
- <replaceable>Short</replaceable> which will only use the description
- (the first line) of the commit message when generating the changelog
- entry (useful when <option>--full</option> is given) and
- <replaceable>Full</replaceable> which will use the full commit
- message when generating the changelog entry (useful when
- <option>--full</option> is not given).
+ Supported actions are: <replaceable>Ignore</replaceable>
+ which will ignore this commit when
+ generating <filename>debian/changelog</filename>,
+ <replaceable>Short</replaceable> which will only use the
+ description (the first line) of the commit message when
+ generating the changelog entry (useful
+ when <option>--full</option> is given) and
+ <replaceable>Full</replaceable> which will use the full
+ commit message when generating the changelog entry (useful
+ when <option>--full</option> is not given).
+ </para>
+ <para>
+ Insteaad of <option>Gbp-Dch</option> the
+ deprecated <option>Git-Dch</option> is still supported.
</para>
</listitem>
</varlistentry>
@@ -453,7 +459,7 @@
so one doesn't have to consult the manual
- Git-Dch: Short
+ Gbp-Dch: Short
Closes: #636088
Thanks: Raphaël Hertzog for the suggestion
</screen>