From b9aae056a67031db81376891c57663803e990ddc Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 10 Jan 2011 15:17:21 +0100
Subject: Make --[no-]merge a proper option

so it can be configured via gbp.conf.
---
 docs/manpages/git-import-orig.sgml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/manpages')

diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 991ba51f..b768fa9a 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -23,7 +23,7 @@
 
       <arg><option>--verbose</option></arg>
       <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg>
-      <arg><option>--no-merge</option></arg>
+      <arg><option>--[no-]merge</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-]sign-tags</option></arg>
@@ -66,9 +66,9 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--no-merge</option></term>
+        <term><option>--merge</option></term>
         <listitem>
-	  <para>Don't merge the upstream version to the development branch</para>
+	  <para>Merge the upstream branch to the debian branch after import</para>
         </listitem>
       </varlistentry>
 
-- 
cgit v1.2.3