From 88afa6117ea4dd6b5d8fd88936afffb11c25ec47 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Fri, 6 Aug 2010 13:55:53 -0400
Subject: Pass --multimaint-merge on to dch

Closes: #586165
---
 docs/manpages/git-dch.sgml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs/manpages')

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>
-- 
cgit v1.2.3