mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
New PIN Callback attributes in gpg-agent.
Common prompts for keypad and simple card reader. More support for Netkey cards; PIN management works now.
This commit is contained in:
parent
2749c6bcd9
commit
59d7a54e72
13 changed files with 687 additions and 163 deletions
|
@ -425,7 +425,7 @@ Import/merge keys. This adds the given keys to the
|
|||
keyring. The fast version is currently just a synonym.
|
||||
|
||||
There are a few other options which control how this command works.
|
||||
Most notable here is the @option{--keyserver-options merge-only} option
|
||||
Most notable here is the @option{--import-options merge-only} option
|
||||
which does not insert new keys but does only the merging of new
|
||||
signatures, user-IDs and subkeys.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue