diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2008-09-22 19:51:32 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-09-22 20:07:08 +0200 |
| commit | 631c3479cc8ee98374ecd07de038aeac01c09695 (patch) | |
| tree | 04ded3aa07ed0bc134ddce484459e9f06ba6768d | |
| parent | 745fbf6ecb43f4f68f2b94cfef2f5e63fac60d99 (diff) | |
document --no-merge
| -rw-r--r-- | docs/manpages/git-import-dsc.sgml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml index d2d6c10e..e9a6740e 100644 --- a/docs/manpages/git-import-dsc.sgml +++ b/docs/manpages/git-import-dsc.sgml @@ -24,6 +24,7 @@ <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>--sign-tags</option></arg> <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg> <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg> @@ -70,6 +71,12 @@ </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>--sign-tags</option> </term> <listitem> |