projects / tools / git-buildpackage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aa3b62e)
Mention --no-merge
authorGuido Günther <agx@sigxcpu.org>
Mon, 1 Sep 2014 07:36:11 +0000 (09:36 +0200)
committerJun Wang <junbill.wang@samsung.com>
Tue, 26 Jan 2016 16:00:03 +0000 (00:00 +0800)
Closes: #760091

docs/manpages/gbp-import-orig.sgml patch | blob | history

diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index f5326d3..db3433b 100644 (file)
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -77,7 +77,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
Domain: SCM / Build;