aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpg.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/gpg.texi')
-rw-r--r--doc/gpg.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 15f58f47e..b8fda9638 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2185,6 +2185,11 @@ opposite meaning. The options are:
This can be combined with the option @option{--dry-run} to only look
at keys.
+ @item import-export
+ Run the entire import code but instead of storing the key to the
+ local keyring write it to the output. This option can be used to
+ remove all invalid parts from a key without the need to store it.
+
@item merge-only
During import, allow key updates to existing keys, but do not allow
any new keys to be imported. Defaults to no.