diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-08-06 13:55:53 -0400 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-08-06 13:55:53 -0400 |
| commit | 88afa6117ea4dd6b5d8fd88936afffb11c25ec47 (patch) | |
| tree | 7109bd62cfdbfbfbbec58ddf5c00a8b4873ee6f2 /docs/manpages | |
| parent | f63c4ed85ca16a6869cf35bc9070e3c28163594e (diff) | |
Pass --multimaint-merge on to dch
Closes: #586165
Diffstat (limited to 'docs/manpages')
| -rw-r--r-- | docs/manpages/git-dch.sgml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml index e8683eb0..5b64e196 100644 --- a/docs/manpages/git-dch.sgml +++ b/docs/manpages/git-dch.sgml @@ -35,6 +35,7 @@ <arg><option>--snapshot-number=</option><replaceable>expression</replaceable></arg> <arg><option>--git-log=</option><replaceable>git-log-options</replaceable></arg> <arg><option>--[no-]git-author</option></arg> + <arg><option>--[no-]multimaint-merge</option></arg> <arg choice="plain"><replaceable>[path1 path2]</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> @@ -204,6 +205,13 @@ <para>Use user.name and user.email from <application>git-config</application>(1) for changelog trailer.</para> </listitem> </varlistentry> + <varlistentry> + <term><option>--[no]-multimaintmerge</option> + </term> + <listitem> + <para>Merge commits by maintainer.</para> + </listitem> + </varlistentry> </variablelist> </refsect1> <refsect1> |