mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
See ChangeLog: Thu Jul 27 17:33:04 CEST 2000 Werner Koch
This commit is contained in:
parent
a2ad808d1f
commit
7f55ee83bb
7 changed files with 41 additions and 4 deletions
11
doc/gpg.sgml
11
doc/gpg.sgml
|
@ -462,6 +462,11 @@ keyring.
|
|||
The fast version does not build
|
||||
the trustdb; this can be done at any time with the
|
||||
command --update-trustdb.
|
||||
</para>
|
||||
<para>
|
||||
There are a few other options which control how this command works.
|
||||
Most notable here is the --merge-only options which does not insert new keys
|
||||
but does only the merging of new signatures, user-IDs and subkeys.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
|
||||
|
@ -1361,6 +1366,12 @@ content of an encrypted message; using this option you can do this without
|
|||
handing out the secret key.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>--merge-only</term>
|
||||
<listitem><para>
|
||||
Don't insert new keys into the keyrings while doing an import.
|
||||
</para></listitem></varlistentry>
|
||||
|
||||
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue