diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-07-03 23:33:50 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-07-04 17:24:48 +0200 |
| commit | fc270b564fab9e9b24b02cb006c7aa6fe00c1285 (patch) | |
| tree | de556f21e8904da79a24c812a3f92d922c61fe1b /docs | |
| parent | 719f1aee1526273e7852639079f0ab65e129ad34 (diff) | |
Drop --no-merge
We don't invoke 'git merge' anymore.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/git-import-dsc.sgml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml index 2a8ccd84..5997ef72 100644 --- 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> |