summaryrefslogtreecommitdiff
path: root/kiki.hs
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2019-07-05 23:18:59 -0400
committerJoe Crayne <joe@jerkface.net>2019-07-05 23:18:59 -0400
commitb0967e64df7a4f4d1cd2af95ccda8a0ba3447138 (patch)
tree8f37777d75307d207589a319f416be6a033f26a3 /kiki.hs
parent1da6145352f403a880890266ca79b57c992cb0dc (diff)
Correction to merge documentation.
Diffstat (limited to 'kiki.hs')
-rw-r--r--kiki.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/kiki.hs b/kiki.hs
index bca3ca5..4126a93 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1303,11 +1303,7 @@ kiki "merge" [] = do
1303 , " | --" 1303 , " | --"
1304 , " | FILE ) ..." 1304 , " | FILE ) ..."
1305 , "" 1305 , ""
1306 , "OPERANDS" 1306 , "OPTIONS"
1307 , ""
1308 , " --home[=HOMEDIR] A symbolic operand that is a place holder for two files:"
1309 , " HOMEDIR/{secring.gpg,pubring.gpg}"
1310 , " HOMEDIR defaults to your GnuPG home directory."
1311 , "" 1307 , ""
1312 , " --agent Use gpg-agent." 1308 , " --agent Use gpg-agent."
1313 , "" 1309 , ""
@@ -1319,6 +1315,12 @@ kiki "merge" [] = do
1319 , "" 1315 , ""
1320 , " --packets After files have been written, declare each known pkg packet." 1316 , " --packets After files have been written, declare each known pkg packet."
1321 , "" 1317 , ""
1318 , "OPERANDS"
1319 , ""
1320 , " --home[=HOMEDIR] A symbolic operand that is a place holder for two files:"
1321 , " HOMEDIR/{secring.gpg,pubring.gpg}"
1322 , " HOMEDIR defaults to your GnuPG home directory."
1323 , ""
1322 , " FILE A path to a key file to read or update." 1324 , " FILE A path to a key file to read or update."
1323 , "" 1325 , ""
1324 , "MODIFIERS" 1326 , "MODIFIERS"