diff options
Diffstat (limited to 'doc/gpg.sgml')
| -rw-r--r-- | doc/gpg.sgml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 465d6d559..c55b9dc9d 100644 --- a/doc/gpg.sgml +++ b/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> |