diff options
| author | Daniel Dehennin <daniel.dehennin@baby-gnu.org> | 2011-11-21 15:44:41 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-04-06 18:29:52 +0200 |
| commit | ae4a3683c3becac1c6dcc8efb2eececb7a630c32 (patch) | |
| tree | b8d9828d8c4c480440c293654f2b3f1043193f7c /docs/manpages | |
| parent | 733573511a77bd2fdbbff61b9bd62b40ad63eac2 (diff) | |
Add option to manage distribution fields for non snapshot mode.
The snapshot mode fails to merge two "debian/changelog" entries if the
distribution is not "UNRELEASED".
* tests/11_test_dch_main.py: test the new --distribution option to
dch.main(). Add only meaningful tests, i.e. options alone and combined
with --release and --snapshot.
* git-dch (fixup_section): Rename as it's used to fix header in addition
to trailer, this require a new named parameter "options".
(main): Add version_group option "-D" and "--distribution" to
specify the distribution name.
Add version_group option "--force-distribution" to force the provided
distribution to be used, used by "dch".
Rename fixup_trailer() to fixup_section() and add options as parameters.
* docs/manpages/git-dch.sgml: Update documentation for new options.
Closes: #646684
Diffstat (limited to 'docs/manpages')
| -rw-r--r-- | docs/manpages/git-dch.sgml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml index a009a58..0cccf09 100644 --- a/docs/manpages/git-dch.sgml +++ b/docs/manpages/git-dch.sgml @@ -41,6 +41,8 @@ <arg><option>--qa</option></arg> <arg><option>--team</option></arg> </group> + <arg><option>--distribution=</option><replaceable>name</replaceable></arg> + <arg><option>--force-distribution</option></arg> <arg><option>--[no-]full</option></arg> <arg><option>--[no-]meta</option></arg> <arg><option>--meta-closes=bug-close-tags</option></arg> @@ -221,6 +223,23 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--distribution=</option><replaceable>name</replaceable> + </term> + <listitem> + <para>Set the distribution field + to <replaceable>name</replaceable>.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--force-distribution</option> + </term> + <listitem> + <para>Force the distribution specified + with <option>--distribution</option> to be used, even if it + doesn't match the list of known distributions.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--git-log=</option><replaceable>git-log-options</replaceable> </term> <listitem> |