From 631c3479cc8ee98374ecd07de038aeac01c09695 Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@sigxcpu.org>
Date: Mon, 22 Sep 2008 19:51:32 +0200
Subject: document --no-merge

---
 docs/manpages/git-import-dsc.sgml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs')

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index d2d6c10e..e9a6740e 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -24,6 +24,7 @@
       <arg><option>--verbose</option></arg>
       <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+      <arg><option>--no-merge</option></arg>
       <arg><option>--sign-tags</option></arg>
       <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
       <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg>
@@ -69,6 +70,12 @@
           <para>verbose execution</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--no-merge</option></term>
+        <listitem>
+	  <para>Don't merge the upstream version to the development branch</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--sign-tags</option>
         </term>
-- 
cgit v1.2.3