diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-01-10 15:17:21 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-01-11 06:46:03 +0100 |
| commit | b9aae056a67031db81376891c57663803e990ddc (patch) | |
| tree | 9f4da0d1f981cfb1b22126ad2be4296c7bbe9f5f /docs/manpages | |
| parent | ec27521aea1bd3f11104a09457ce4df7bb23019d (diff) | |
Make --[no-]merge a proper option
so it can be configured via gbp.conf.
Diffstat (limited to 'docs/manpages')
| -rw-r--r-- | docs/manpages/git-import-orig.sgml | 6 |
1 files changed, 3 insertions, 3 deletions
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> |