From 1e5959ec059ba41f4de1e2f953300bc040efc16f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 23 Jun 2016 19:25:53 +0200 Subject: gpg: New import option "import-show". * g10/options.h (IMPORT_SHOW): New. * g10/import.c (parse_import_options): Add "import-show". (import_one): Implement that. Signed-off-by: Werner Koch --- doc/gpg.texi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/gpg.texi b/doc/gpg.texi index 3ea298eb4..15f58f47e 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -233,7 +233,7 @@ read from STDIN. If only a one argument is given, it is expected to be a complete signature. With more than 1 argument, the first should be a detached signature -and the remaining files ake up the the signed data. To read the signed +and the remaining files make up the the signed data. To read the signed data from STDIN, use @samp{-} as the second filename. For security reasons a detached signature cannot read the signed material from STDIN without denoting it in the above way. @@ -2180,6 +2180,11 @@ opposite meaning. The options are: subkey. Defaults to no for regular @option{--import} and to yes for keyserver @option{--recv-keys}. + @item import-show + Show a listing of the key as imported right before it is stored. + This can be combined with the option @option{--dry-run} to only look + at keys. + @item merge-only During import, allow key updates to existing keys, but do not allow any new keys to be imported. Defaults to no. -- cgit v1.2.3