From: Junio C Hamano Date: Mon, 29 Jul 2019 19:38:12 +0000 (-0700) Subject: Merge branch 'rm/gpg-program-doc-fix' into maint X-Git-Tag: v2.23.0-rc0~1^2~36 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2b312841a84fbfc4b761f7f9e050a6fbbbad2509?hp=58f6cfd8ce3c4621d4a772b81b7c92f7519154f1 Merge branch 'rm/gpg-program-doc-fix' into maint Docfix. * rm/gpg-program-doc-fix: gpg(docs): use correct --verify syntax --- diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index f999f8ea49..cce2c89245 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -2,7 +2,7 @@ gpg.program:: Use this custom program instead of "`gpg`" found on `$PATH` when making or verifying a PGP signature. The program must support the same command-line interface as GPG, namely, to verify a detached - signature, "`gpg --verify $file - <$signature`" is run, and the + signature, "`gpg --verify $signature - <$file`" is run, and the program is expected to signal a good signature by exiting with code 0, and to generate an ASCII-armored detached signature, the standard input of "`gpg -bsau $key`" is fed with the contents to be