From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 1 Sep 2014 07:36:11 +0000 (+0200)
Subject: Mention --no-merge
X-Git-Tag: debian/0.6.18~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a37832e418f3b96acf1c14838a495e2bc08fa574;p=tools%2Fgit-buildpackage.git

Mention --no-merge

Closes: #760091
---

diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index b744752..31f433b 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -76,7 +76,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--merge</option></term>
+        <term><option>--[no-]merge</option></term>
         <listitem>
           <para>
           Merge the upstream branch to the debian branch after import