From a37832e418f3b96acf1c14838a495e2bc08fa574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Mon, 1 Sep 2014 09:36:11 +0200
Subject: Mention --no-merge

Closes: #760091
---
 docs/manpages/gbp-import-orig.sgml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/manpages')

diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index b744752a..31f433b4 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
-- 
cgit v1.2.3