Drop --no-merge

We don't invoke 'git merge' anymore.

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 2a8ccd8..5997ef7 100644 (file)
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -24,7 +24,6 @@
       <arg><option>--verbose</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-merge</option></arg>
       <arg><option>--[no-]sign-tags</option></arg>
       <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
       <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg>
@@ -81,12 +80,6 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--no-merge</option></term>
-        <listitem>
-         <para>Don't merge the upstream version to the development branch</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><option>--[no-]sign-tags</option>
         </term>
         <listitem>

diff --git a/git-import-dsc b/git-import-dsc
index 03cdc42..705b396 100755 (executable)
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -164,9 +164,6 @@ def main(argv):
                       dest="debian_branch")
     branch_group.add_config_file_option(option_name="upstream-branch",
                       dest="upstream_branch")
-    branch_group.add_option("--no-merge", dest='merge', action="store_false",
-                      default=True,
-                      help="after import dont do any merging to another branch")
 
     tag_group.add_boolean_config_file_option(option_name="sign-tags",
                       dest="sign_tags")