diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-09-01 09:36:11 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-09-01 09:36:11 +0200 |
| commit | a37832e418f3b96acf1c14838a495e2bc08fa574 (patch) | |
| tree | aa5391f9aa8b176692c19fab5883849168c0474e /docs | |
| parent | 6edd8363eab02832f8bb58f3405609503b6458af (diff) | |
| download | git-buildpackage-a37832e418f3b96acf1c14838a495e2bc08fa574.tar.gz git-buildpackage-a37832e418f3b96acf1c14838a495e2bc08fa574.tar.bz2 git-buildpackage-a37832e418f3b96acf1c14838a495e2bc08fa574.zip | |
Mention --no-merge
Closes: #760091
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/gbp-import-orig.sgml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml index b744752a..31f433b4 100644 --- a/docs/manpages/gbp-import-orig.sgml +++ b/docs/manpages/gbp-import-orig.sgml @@ -76,7 +76,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--merge</option></term> + <term><option>--[no-]merge</option></term> <listitem> <para> Merge the upstream branch to the debian branch after import |