diff options
| author | Werner Koch <[email protected]> | 2016-06-23 17:25:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-23 18:01:15 +0000 |
| commit | 1e5959ec059ba41f4de1e2f953300bc040efc16f (patch) | |
| tree | 244e65eb505238b73fdc24d14aa0d1d626f116cc /doc/gpg.texi | |
| parent | gpg: Do not print the validity after key generation. (diff) | |
| download | gnupg-1e5959ec059ba41f4de1e2f953300bc040efc16f.tar.gz gnupg-1e5959ec059ba41f4de1e2f953300bc040efc16f.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | doc/gpg.texi | 7 |
1 files changed, 6 insertions, 1 deletions
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. |