Mention --no-merge
authorGuido Günther <agx@sigxcpu.org>
Mon, 1 Sep 2014 07:36:11 +0000 (09:36 +0200)
committerGuido Günther <agx@sigxcpu.org>
Mon, 1 Sep 2014 07:36:11 +0000 (09:36 +0200)
Closes: #760091

docs/manpages/gbp-import-orig.sgml

index b744752..31f433b 100644 (file)
@@ -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